miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

You're now specifying both shared and static libraries through ChangeAppsettings.sh, LDFlags variable should be empty -

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/Android.mk
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