Changed directory structure to contain less symlinks so dependencies will get recalculated correctly by make

project/jni/Android.mk

@@ -35,6 +35,8 @@ APPLICATION_CUSTOM_BUILD_SCRIPT :=
 
 SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=LCTRL -DSDL_ANDROID_KEYCODE_2=PAGEUP -DSDL_ANDROID_KEYCODE_3=PAGEDOWN -DSDL_ANDROID_KEYCODE_4=LCTRL
 
+SDL_VERSION := 1.3
+
 # If SDL_Mixer should link to libMAD
 SDL_MIXER_USE_LIBMAD :=
 ifneq ($(strip $(filter mad, $(COMPILED_LIBRARIES))),)

project/jni/Application.mk

@@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/..
 # sdl_image depends on png and jpeg
 # sdl_ttf depends on freetype
 
-APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image
+APP_MODULES := application sdl-1.3 sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image
 
 APP_ABI := armeabi

project/jni/application/Android.mk

@@ -20,7 +20,7 @@ endif
 # Paths should be on newline so launchConfigure.sh will work properly
 LOCAL_CFLAGS += \
 				$(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/../sdl/include \
+				-I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
 				-I$(LOCAL_PATH)/../sdl_mixer \
 				-I$(LOCAL_PATH)/../sdl_image \
 				-I$(LOCAL_PATH)/../sdl_ttf \
@@ -47,7 +47,7 @@ ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
 LOCAL_SRC_FILES := dummy.c
 endif
 
-LOCAL_SHARED_LIBRARIES := sdl $(COMPILED_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(COMPILED_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES := stlport
 

project/jni/application/launchConfigure.sh

@@ -32,7 +32,7 @@ CFLAGS="-I$NDK/build/platforms/$PLATFORMVER/arch-arm/usr/include \
 -Wno-psabi -march=armv5te -mtune=xscale -msoft-float -fno-exceptions -fno-rtti -mthumb -Os \
 -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
 -Wa,--noexecstack -O2 -DNDEBUG -g \
-`grep '[-]I[$][(]LOCAL_PATH[)]/[.][.]/' $LOCAL_PATH/Android.mk | tr '\n' ' ' | sed 's/[\\]//g' | sed \"s@[\$][(]LOCAL_PATH[)]/@$LOCAL_PATH/@g\" | sed 's/[	 ][	 ]*/ /g'`"
+`grep '[-]I[$][(]LOCAL_PATH[)]/[.][.]/' $LOCAL_PATH/Android.mk | tr '\n' ' ' | sed 's/[\\]//g' | sed \"s@[\$][(]LOCAL_PATH[)]/@$LOCAL_PATH/@g\" | sed 's/[	 ][	 ]*/ /g'` | sed 's@[$][(]SDL_VERSION[)]@1.2@'"
 
 LDFLAGS="-nostdlib -Wl,-soname,libapplication.so -Wl,-shared,-Bsymbolic \
 -Wl,--whole-archive  -Wl,--no-whole-archive \

project/jni/application/sdl-config

@@ -47,11 +47,11 @@ while test $# -gt 0; do
       echo -I${prefix}/include -D_GNU_SOURCE=1 -D_REENTRANT
       ;;
     --libs)
-      echo -L${exec_prefix} -lsdl
+      echo -L${exec_prefix} -lsdl-1.2
       ;;
     --static-libs)
 #    --libs|--static-libs)
-      echo -L${exec_prefix} -lsdl
+      echo -L${exec_prefix} -lsdl-1.2
       ;;
     *)
       echo "${usage}" 1>&2

project/jni/sdl

@@ -1 +0,0 @@
-../sdl/sdl-1.3