Updated build system and added some missing symlinks

2011-06-07 13:50:42 +03:00
parent dd2e589159
commit f12b3810d3
8 changed files with 9 additions and 3 deletions
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -92,7 +92,7 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)

 LOCAL_PATH_SDL_APPLICATION := $(LOCAL_PATH)

-.NOTPARALLEL: $(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so) $(LOCAL_PATH)/src/libapplication.so
+.NOTPARALLEL: $(abspath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so) $(LOCAL_PATH)/src/libapplication.so

 # Enforce rebuilding
 $(shell rm -f $(LOCAL_PATH)/src/libapplication.so)
@@ -103,7 +103,7 @@ $(LOCAL_PATH)/src/libapplication.so: $(LOCAL_PATH)/src/AndroidBuild.sh $(LOCAL_P
 	echo Launching script $(LOCAL_PATH_SDL_APPLICATION)/AndroidBuild.sh
 	cd $(LOCAL_PATH_SDL_APPLICATION)/src && ./AndroidBuild.sh

-$(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so): $(LOCAL_PATH)/src/libapplication.so OVERRIDE_CUSTOM_LIB
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi/libapplication.so): $(LOCAL_PATH)/src/libapplication.so OVERRIDE_CUSTOM_LIB
 	cp -f $< $@

 .PHONY: OVERRIDE_CUSTOM_LIB
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-openttd
+vcmi
--- a/project/jni/sdl_blitpool/include/SDL
+++ b/project/jni/sdl_blitpool/include/SDL
@@ -0,0 +1 @@
+.
--- a/project/jni/sdl_gfx/include/SDL
+++ b/project/jni/sdl_gfx/include/SDL
@@ -0,0 +1 @@
+.
--- a/project/jni/sdl_image/include/SDL
+++ b/project/jni/sdl_image/include/SDL
@@ -0,0 +1 @@
+.
--- a/project/jni/sdl_net/include/SDL
+++ b/project/jni/sdl_net/include/SDL
@@ -0,0 +1 @@
+.
--- a/project/jni/sdl_sound/include/SDL
+++ b/project/jni/sdl_sound/include/SDL
@@ -0,0 +1 @@
+.
--- a/project/jni/sdl_ttf/include/SDL
+++ b/project/jni/sdl_ttf/include/SDL
@@ -0,0 +1 @@
+.