Commit b9d1f9edd8d1fccb9bd6dcf3b229369f4dd3f708

Sam Lantinga 2014-06-15T13:01:10

Fixed Android error on static lib build, if relative NDK_MODULE_PATH used Stefan P?schel if the variable NDK_MODULE_PATH is set to a relative path (like "../"), compiling of a static SDL lib fails with an error similar to this: make: *** No rule to make target `..//android_libs/SDL/..//android_libs/SDL/src/main/android/SDL_android_main.c', needed by `obj/local/armeabi/objs/SDL2_static/__//android_libs/SDL/src/main/android/SDL_android_main.o'. Stop. Regarding the shared lib, this is already prevented by a "subst" command in the /Android.mk, which removes all occurences of "$(LOCAL_PATH)/". The attached patch does the same with the additional "SDL_android_main.c", which is included for build the static SDL lib.

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/Android.mk b/Android.mk
index 4f94082..7541443 100755
--- a/Android.mk
+++ b/Android.mk
@@ -61,7 +61,7 @@ LOCAL_MODULE := SDL2_static
 
 LOCAL_MODULE_FILENAME := libSDL2
 
-LOCAL_SRC_FILES += $(LOCAL_PATH)/src/main/android/SDL_android_main.c
+LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c)
 
 LOCAL_LDLIBS := 
 LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid