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
2010-10-15 18:18:23 +03:00
parent a8f3d8b6b7
commit 11d99e03fb
10 changed files with 1070 additions and 22 deletions

View File

@@ -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 :=

View File

@@ -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

View File

@@ -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

View File

@@ -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'

View File

@@ -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!^'

View File

@@ -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'

File diff suppressed because it is too large Load Diff

View File

@@ -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'

View File

@@ -0,0 +1,2 @@
#!/bin/sh
adb shell rm -r /data/data/com.teeworlds/files/.teeworlds