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

ChangeAppSettings.sh

@@ -13,9 +13,6 @@ if [ "$CHANGE_APP_SETTINGS_VERSION" != "$AppSettingVersion" ]; then
 	AUTO=
 fi
 
-LibSdlVersionOld=`readlink project/jni/sdl | grep -o '[0-9][.][0-9]'`
-CompiledLibrariesOld=$CompiledLibraries
-
 var=""
 
 if [ -z "$AUTO" ]; then
@@ -305,7 +302,7 @@ if [ "$MultiABI" = "y" ] ; then
 else
 	MultiABI="armeabi"
 fi
-LibrariesToLoad="System.loadLibrary(\\\"sdl\\\");"
+LibrariesToLoad="System.loadLibrary(\\\"sdl-$LibSdlVersion\\\");"
 for lib in $CompiledLibraries; do
 	LibrariesToLoad="$LibrariesToLoad System.loadLibrary(\\\"$lib\\\");"
 done
@@ -316,12 +313,6 @@ fi
 
 ReadmeText="`echo $ReadmeText | sed 's/\"/\\\\\\\\\"/g' | sed 's/[&%]//g'`"
 
-echo Creating symlink to libSDL
-if [ "`readlink project/jni/sdl`" '!=' "../sdl/sdl-$LibSdlVersion" ]; then
-	rm -f project/jni/sdl
-	ln -s ../sdl/sdl-$LibSdlVersion project/jni/sdl
-fi
-
 echo Patching project/AndroidManifest.xml
 cat project/AndroidManifest.xml | \
 	sed "s/package=.*/package=\"$AppFullName\"/" | \
@@ -367,7 +358,8 @@ cat project/jni/Android.mk | \
 	sed "s^APPLICATION_ADDITIONAL_LDFLAGS :=.*^APPLICATION_ADDITIONAL_LDFLAGS := $AppLdflags^" | \
 	sed "s^SDL_ADDITIONAL_CFLAGS :=.*^SDL_ADDITIONAL_CFLAGS := $RedefinedKeycodes^" | \
 	sed "s^APPLICATION_SUBDIRS_BUILD :=.*^APPLICATION_SUBDIRS_BUILD := $AppSubdirsBuild^" | \
-	sed "s^APPLICATION_CUSTOM_BUILD_SCRIPT :=.*^APPLICATION_CUSTOM_BUILD_SCRIPT := $CustomBuildScript^" > \
+	sed "s^APPLICATION_CUSTOM_BUILD_SCRIPT :=.*^APPLICATION_CUSTOM_BUILD_SCRIPT := $CustomBuildScript^" | \
+	sed "s^SDL_VERSION :=.*^SDL_VERSION := $LibSdlVersion^"  > \
 	project/jni/Android.mk.1
 if [ -n "`diff -w project/jni/Android.mk.1 project/jni/Android.mk`" ] ; then
 	mv -f project/jni/Android.mk.1 project/jni/Android.mk
@@ -377,7 +369,7 @@ fi
 
 echo Patching project/jni/Application.mk
 cat project/jni/Application.mk | \
-	sed "s/APP_MODULES := .*/APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype $CompiledLibraries/" | \
+	sed "s/APP_MODULES := .*/APP_MODULES := application sdl-$LibSdlVersion sdl_main stlport tremor png jpeg freetype $CompiledLibraries/" | \
 	sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" > \
 	project/jni/Application.mk.1
 if [ -n "`diff -w project/jni/Application.mk.1 project/jni/Application.mk`" ] ; then
@@ -392,22 +384,14 @@ cat project/res/values/strings.xml | \
 	project/res/values/strings.xml.1
 mv -f project/res/values/strings.xml.1 project/res/values/strings.xml
 
-echo Forcing rebuild of specific files
+echo If you change libSDL version you have to clean all files in project/libs/obj
 rm -rf project/libs/*
 for OUT in obj; do
 rm -rf project/$OUT/local/*/objs/sdl_main/* project/$OUT/local/*/libsdl_main.so
-rm -rf project/$OUT/local/*/libsdl.so
-rm -rf project/$OUT/local/*/libstlport.a # Should be re-linked if you're changing toolchain
-rm -rf project/$OUT/local/*/objs/sdl/src/*/android
-rm -rf project/$OUT/local/*/objs/sdl/src/video/SDL_video.o
-rm -rf project/$OUT/local/*/objs/sdl/SDL_renderer_gles.o
-if [ "$LibSdlVersionOld" '!=' "$LibSdlVersion" ]; then
-	# Internal types are different in SDL 1.2 and 1.3, namely SDL_Rect, so all libs using it have to be recompiled
-	rm -rf project/$OUT/local/*/objs/sdl* project/$OUT/local/*/libsdl*
-	rm -rf project/$OUT/local/*/objs/application project/$OUT/local/*/libapplication.so
-fi
-# Do not rebuild libraries that do not need that
-# find project/$OUT/local -name "*.[oa]" -exec touch '{}' \;
+rm -rf project/$OUT/local/*/libsdl-*.so
+rm -rf project/$OUT/local/*/objs/sdl-*/src/*/android
+rm -rf project/$OUT/local/*/objs/sdl-*/src/video/SDL_video.o
+rm -rf project/$OUT/local/*/objs/sdl-*/SDL_renderer_gles.o
 done
 
 echo Done

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