You're now specifying both shared and static libraries through ChangeAppsettings.sh, LDFlags variable should be empty -
that fixes dependencies and subtle bugs caused by multiple jobs in make when static lib not yet created but already linked to.
This commit is contained in:
pelya
@@ -46,7 +46,7 @@ fi
|
||||
echo -n "\nSpecify path to download application data in zip archive in the form 'Description|URL|MirrorURL|...'"
|
||||
echo -n "\nYou may specify additional paths to optional game content delimited by newlines (empty line to finish)"
|
||||
echo -n "\nIf the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as-is to game dir and not unzipped"
|
||||
echo -n "\nIf the URL does not contain 'http://' it is treated as file in 'project/assets' dir (it is bundled in .apk file)\n\n"
|
||||
echo -n "\nIf the URL does not contain 'http://' it is treated as file in 'project/assets' dir, which is bundled in .apk file\n\n"
|
||||
echo -n "`echo $AppDataDownloadUrl | tr '^' '\\n'`"
|
||||
echo
|
||||
AppDataDownloadUrl1=""
|
||||
@@ -72,7 +72,7 @@ if [ -n "$var" ] ; then
|
||||
SdlVideoResize="$var"
|
||||
fi
|
||||
|
||||
echo -n "\nApplication resizing should preserve the aspect ratio, creating black bars (y) or (n) ($SdlVideoResizeKeepAspect): "
|
||||
echo -n "\nApplication resizing should use 4:3 aspect ratio, creating black bars (y) or (n) ($SdlVideoResizeKeepAspect): "
|
||||
read var
|
||||
if [ -n "$var" ] ; then
|
||||
SdlVideoResizeKeepAspect="$var"
|
||||
@@ -97,7 +97,7 @@ if [ -n "$var" ] ; then
|
||||
AppNeedsArrowKeys="$var"
|
||||
fi
|
||||
|
||||
echo -n "\nApplication uses joystick (y) or (n), the accelerometer (2-axis) or orientation sensor (3-axis)\nwill be used as joystick 0, also on-screen DPAD will be used as joystick ($AppUsesJoystick): "
|
||||
echo -n "\nApplication uses joystick (y) or (n), the accelerometer (2-axis) or orientation sensor (3-axis)\nwill be used as joystick 0, also on-screen DPAD will be used as joystick -\nmake sure you can navigate all app menus with joystick or mouse ($AppUsesJoystick): "
|
||||
read var
|
||||
if [ -n "$var" ] ; then
|
||||
AppUsesJoystick="$var"
|
||||
@@ -340,8 +340,16 @@ else
|
||||
MultiABI="armeabi"
|
||||
fi
|
||||
LibrariesToLoad="System.loadLibrary(\\\"sdl-$LibSdlVersion\\\");"
|
||||
StaticLibraries=`grep 'APP_AVAILABLE_STATIC_LIBS' project/jni/Application.mk | sed 's/.*=\(.*\)/\1/'`
|
||||
echo StaticLibraries $StaticLibraries
|
||||
for lib in $CompiledLibraries; do
|
||||
LibrariesToLoad="$LibrariesToLoad System.loadLibrary(\\\"$lib\\\");"
|
||||
process=true
|
||||
for lib1 in $StaticLibraries; do
|
||||
if [ "$lib" = "$lib1" ]; then process=false; fi
|
||||
done
|
||||
if $process; then
|
||||
LibrariesToLoad="$LibrariesToLoad System.loadLibrary(\\\"$lib\\\");"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$CustomBuildScript" = "n" ] ; then
|
||||
|
||||
@@ -25,11 +25,11 @@ SDL_VIDEO_RENDER_RESIZE := 1
|
||||
|
||||
SDL_VIDEO_RENDER_RESIZE_KEEP_ASPECT := 1
|
||||
|
||||
COMPILED_LIBRARIES := sdl_mixer sdl_image sdl_ttf intl lua
|
||||
COMPILED_LIBRARIES := sdl_mixer sdl_image sdl_ttf intl lua png xerces
|
||||
|
||||
APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
|
||||
|
||||
APPLICATION_ADDITIONAL_LDFLAGS := -lpng -lxerces
|
||||
APPLICATION_ADDITIONAL_LDFLAGS :=
|
||||
|
||||
APPLICATION_SUBDIRS_BUILD :=
|
||||
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
APP_PROJECT_PATH := $(call my-dir)/..
|
||||
|
||||
# Available libraries: mad sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx intl xml2 lua
|
||||
# Available static libraries (specified in AppLdflags as "-ljpeg"): jpeg png tremor freetype xerces
|
||||
# sdl_mixer depends on tremor and optionally mad
|
||||
# sdl_image depends on png and jpeg
|
||||
# sdl_ttf depends on freetype
|
||||
# Available libraries: mad sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx intl xml2 lua jpeg png tremor freetype xerces
|
||||
|
||||
APP_MODULES := application sdl-1.2 sdl_main stlport tremor png jpeg freetype xerces sdl_mixer sdl_image sdl_ttf intl lua
|
||||
APP_MODULES := application sdl-1.2 sdl_main stlport tremor png jpeg freetype xerces sdl_mixer sdl_image sdl_ttf intl lua png xerces
|
||||
|
||||
# To filter out static libs from all libs in makefile
|
||||
APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces
|
||||
|
||||
APP_ABI := armeabi
|
||||
|
||||
@@ -49,9 +49,9 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
|
||||
LOCAL_SRC_FILES := dummy.c
|
||||
endif
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(COMPILED_LIBRARIES)
|
||||
LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(filter-out $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES))
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := stlport
|
||||
LOCAL_STATIC_LIBRARIES := stlport $(filter $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES))
|
||||
|
||||
LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
|
||||
|
||||
|
||||
@@ -18,9 +18,9 @@ AppTouchscreenKeyboardKeysAmountAutoFire=2
|
||||
MultiABI=n
|
||||
AppVersionCode=21001
|
||||
AppVersionName="2.1.0.01"
|
||||
CompiledLibraries="sdl_mixer"
|
||||
CompiledLibraries="sdl_mixer png"
|
||||
CustomBuildScript=n
|
||||
AppCflags='-O2 -finline-functions -DSOUND'
|
||||
AppLdflags='-Lobj/local/armeabi -lpng'
|
||||
AppLdflags=''
|
||||
AppSubdirsBuild=''
|
||||
ReadmeText='^You may press "Home" now - the data will be downloaded in background'
|
||||
|
||||
@@ -20,10 +20,10 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
|
||||
MultiABI=n
|
||||
AppVersionCode=1
|
||||
AppVersionName="0.1"
|
||||
CompiledLibraries="sdl_mixer sdl_image sdl_ttf intl lua"
|
||||
CompiledLibraries="sdl_mixer sdl_image sdl_ttf intl lua png xerces"
|
||||
CustomBuildScript=n
|
||||
AppCflags='-finline-functions -O2'
|
||||
AppLdflags='-lpng -lxerces'
|
||||
AppLdflags=''
|
||||
AppSubdirsBuild=''
|
||||
AppUseCrystaXToolchain=y
|
||||
ReadmeText='^You can press "Home" now - the data will be downloaded in background^Have fun playing enigma!^'
|
||||
|
||||
@@ -18,10 +18,10 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
|
||||
MultiABI=n
|
||||
AppVersionCode=1012
|
||||
AppVersionName="1.0.12 - fixed keys stuck sometimes for on-screen keyboard, also disabled auto-fire on user request"
|
||||
CompiledLibraries="sdl_image"
|
||||
CompiledLibraries="sdl_image tremor"
|
||||
CustomBuildScript=n
|
||||
AppCflags='-O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1'
|
||||
AppLdflags='-Lobj/local/armeabi -ltremor'
|
||||
AppLdflags=''
|
||||
AppSubdirsBuild=''
|
||||
AppUseCrystaXToolchain=n
|
||||
ReadmeText='^You may press "Home" now - the data will be downloaded in background'
|
||||
|
||||
1039
project/jni/application/sc2/sc2-android.diff
Normal file
1039
project/jni/application/sc2/sc2-android.diff
Normal file
File diff suppressed because it is too large
Load Diff
@@ -18,10 +18,10 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
|
||||
MultiABI=y
|
||||
AppVersionCode=5202
|
||||
AppVersionName="0.5.2.02"
|
||||
CompiledLibraries="sdl_image"
|
||||
CompiledLibraries="sdl_image freetype"
|
||||
CustomBuildScript=n
|
||||
AppCflags='-O2'
|
||||
AppLdflags='-Lbin/ndk/local/armeabi -lfreetype'
|
||||
AppLdflags=''
|
||||
AppSubdirsBuild=''
|
||||
AppUseCrystaXToolchain=n
|
||||
ReadmeText='^You may press "Home" now - the data will be downloaded in background'
|
||||
|
||||
2
project/jni/application/teeworlds/cleanConfig.sh
Executable file
2
project/jni/application/teeworlds/cleanConfig.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
adb shell rm -r /data/data/com.teeworlds/files/.teeworlds
|
||||
Reference in New Issue
Block a user