Fix bugs with package name directory and zip file

This commit is contained in:
OttoLidenbrock 2015-05-10 19:00:55 +10:00
parent 102e9bea51
commit a497e87a96
3 changed files with 6 additions and 3 deletions

View File

@ -664,7 +664,10 @@ assets : $(ASSETS_TIMESTAMP)
ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \
find MultiCraft >"filelist.txt"; \
cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old; \
zip -r -q ${ROOT}/assets/Files.zip ${ROOT}/assets/MultiCraft/ \
pushd ${ROOT}/assets/; \
echo "Creating Files.zip"; \
zip -r -X -q Files.zip MultiCraft/*; \
popd; \
else \
echo "nothing to be done for assets"; \
fi

View File

@ -13,7 +13,7 @@
#if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "multicraft"
#define PROJECT_NAME "MultiCraft"
#define PROJECT_NAME_C "MultiCraft"
#define STATIC_SHAREDIR ""
#include "android_version.h"

View File

@ -322,7 +322,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_particles", "false");
settings->setDefault("video_driver", "ogles1");
settings->setDefault("touchtarget", "true");
settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME "/tmp/");
settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
settings->setDefault("touchscreen_threshold","20");
settings->setDefault("smooth_lighting", "false");
settings->setDefault("max_simultaneous_block_sends_per_client", "3");