From d84eac20a4642ae7a33fc922a533b818e025ccad Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Sun, 2 Jan 2022 01:34:45 +0200
Subject: [PATCH] Fixed SDL2 and sdl-1.2 version in build files, SDL2 is
 uppercase but sdl-1.2 is lowercase and the only one who I can blame is myself

---
 project/jni/application/supertux/AndroidAppSettings.cfg | 6 +++---
 project/jni/faad/Android.mk                             | 4 ++--
 project/jni/fluidsynth/Android.mk                       | 4 ++--
 project/jni/guichan/Android.mk                          | 4 ++--
 project/jni/iconv/src                                   | 2 +-
 project/jni/openal/Android.mk                           | 2 +-
 project/jni/sdl_blitpool/Android.mk                     | 4 ++--
 project/jni/sdl_gfx/Android.mk                          | 4 ++--
 project/jni/sdl_image/Android.mk                        | 4 ++--
 project/jni/sdl_main/Android.mk                         | 4 ++--
 project/jni/sdl_mixer/Android.mk                        | 6 +++---
 project/jni/sdl_native_helpers/Android.mk               | 2 +-
 project/jni/sdl_net/Android.mk                          | 4 ++--
 project/jni/sdl_savepng/Android.mk                      | 4 ++--
 project/jni/sdl_sound/Android.mk                        | 4 ++--
 project/jni/sdl_ttf/Android.mk                          | 4 ++--
 project/jni/zzip/Android.mk                             | 4 ++--
 17 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg
index 64fc1f5c8..ddd92a97f 100644
--- a/project/jni/application/supertux/AndroidAppSettings.cfg
+++ b/project/jni/application/supertux/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="SuperTux"
 AppFullName=org.lethargik.supertux2
 
 # Application version code (integer)
-AppVersionCode=05120
+AppVersionCode=06321
 
 # Application user-visible version name (string)
-AppVersionName="0.5.1.20"
+AppVersionName="0.6.3.21"
 
 # Specify path to download application data in zip archive in the form "Description|URL|MirrorURL^Description2|URL2|MirrorURL2^..."
 # If you'll start Description with '!' symbol it will be enabled by default, '!!' will also hide the entry from the menu, so it cannot be disabled
@@ -308,7 +308,7 @@ AppLdflags='-frtti -fexceptions -Oz'
 AppOverlapsSystemHeaders=n
 
 # Build only following subdirs (empty will build all dirs, ignored with custom script)
-AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external/obstack supertux/external/squirrel/include supertux/external/squirrel/squirrel supertux/external/squirrel/sqstdlib supertux/external/tinygettext/include supertux/external/tinygettext/src supertux/external/sexp-cpp/include supertux/external/sexp-cpp/src supertux/external/physfs/src supertux/external/partio_zip supertux/external/SDL_SavePNG'
+AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external/obstack supertux/external/squirrel/include supertux/external/squirrel/squirrel supertux/external/squirrel/sqstdlib supertux/external/tinygettext/include supertux/external/tinygettext/src supertux/external/sexp-cpp/include supertux/external/sexp-cpp/src supertux/external/physfs/src supertux/external/partio_zip supertux/external/SDL_SavePNG supertux/external/SDL_ttf'
 
 # Exclude these files from build
 AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl supertux/external/SDL_SavePNG/main.c'
diff --git a/project/jni/faad/Android.mk b/project/jni/faad/Android.mk
index 4c374d0b8..3d6f4e286 100644
--- a/project/jni/faad/Android.mk
+++ b/project/jni/faad/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := faad
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-1.2/include
 LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -include stdint.h -Werror=implicit
 
 LOCAL_CPP_EXTENSION := .cpp
@@ -14,7 +14,7 @@ LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 
 LOCAL_STATIC_LIBRARIES := 
 
diff --git a/project/jni/fluidsynth/Android.mk b/project/jni/fluidsynth/Android.mk
index b05770529..904bbfca0 100644
--- a/project/jni/fluidsynth/Android.mk
+++ b/project/jni/fluidsynth/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := fluidsynth
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-1.2/include
 LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -include stdint.h -Werror=implicit
 
 LOCAL_CPP_EXTENSION := .cpp
@@ -14,7 +14,7 @@ LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 
 LOCAL_STATIC_LIBRARIES := 
 
diff --git a/project/jni/guichan/Android.mk b/project/jni/guichan/Android.mk
index dfaeaa1cb..3a3cc9176 100755
--- a/project/jni/guichan/Android.mk
+++ b/project/jni/guichan/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := guichan
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include \
 					$(LOCAL_PATH)/../sdl_image/include $(LOCAL_PATH)/../sdl_ttf/include
 LOCAL_CFLAGS := -DHAVE_CONFIG_H -D_GNU_SOURCE=1 -D_REENTRANT -fexceptions -frtti
 
@@ -15,7 +15,7 @@ LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 LOCAL_SHARED_LIBRARIES += sdl_image sdl_ttf
 
 LOCAL_STATIC_LIBRARIES := 
diff --git a/project/jni/iconv/src b/project/jni/iconv/src
index 6c799ca5a..be1658d1b 160000
--- a/project/jni/iconv/src
+++ b/project/jni/iconv/src
@@ -1 +1 @@
-Subproject commit 6c799ca5a23ca4ee0e1ff38e1ab96fb0f9518c9c
+Subproject commit be1658d1b8d8ef04828a90295f33e3cc8190d224
diff --git a/project/jni/openal/Android.mk b/project/jni/openal/Android.mk
index d9c8a2e27..daabfb853 100644
--- a/project/jni/openal/Android.mk
+++ b/project/jni/openal/Android.mk
@@ -14,7 +14,7 @@ LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := $(if $(filter 1.2, $(SDL_VERSION)), sdl-1.2, SDL2)
 
 LOCAL_STATIC_LIBRARIES :=
 
diff --git a/project/jni/sdl_blitpool/Android.mk b/project/jni/sdl_blitpool/Android.mk
index 71dbcedfe..866bb51c9 100644
--- a/project/jni/sdl_blitpool/Android.mk
+++ b/project/jni/sdl_blitpool/Android.mk
@@ -4,14 +4,14 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_blitpool
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := SDL_blitpool.c
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_LDLIBS :=
 
diff --git a/project/jni/sdl_gfx/Android.mk b/project/jni/sdl_gfx/Android.mk
index 23fee7743..6f0b0cd58 100644
--- a/project/jni/sdl_gfx/Android.mk
+++ b/project/jni/sdl_gfx/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_gfx
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
@@ -12,7 +12,7 @@ LOCAL_CPP_EXTENSION := .cpp
 # Note this simple makefile var substitution, you can find even simpler examples in different Android projects
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/project/jni/sdl_image/Android.mk b/project/jni/sdl_image/Android.mk
index 42d94df19..99343e44d 100644
--- a/project/jni/sdl_image/Android.mk
+++ b/project/jni/sdl_image/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_image
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../jpeg/include $(LOCAL_PATH)/../png/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../jpeg/include $(LOCAL_PATH)/../png/include $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include
 LOCAL_CFLAGS := \
        -DLOAD_JPG -DLOAD_PNG -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM \
        -DLOAD_PCX -DLOAD_PNM -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM \
@@ -20,7 +20,7 @@ LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 LOCAL_STATIC_LIBRARIES := png jpeg
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 
 LOCAL_LDLIBS := -lz
 
diff --git a/project/jni/sdl_main/Android.mk b/project/jni/sdl_main/Android.mk
index 7886721a0..45790d145 100644
--- a/project/jni/sdl_main/Android.mk
+++ b/project/jni/sdl_main/Android.mk
@@ -8,14 +8,14 @@ ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
 endif
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../sdl-1.2/include
 LOCAL_CFLAGS := -DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) -DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\"
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := sdl_main.c SDL_android_main.cpp
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) application
+LOCAL_SHARED_LIBRARIES := sdl-1.2 application
 LOCAL_LDLIBS := -llog
 
 ifeq ($(CUSTOM_BUILD_SCRIPT_FIRST_PASS),)
diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk
index f3bbbcddb..30bc892b9 100644
--- a/project/jni/sdl_mixer/Android.mk
+++ b/project/jni/sdl_mixer/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_mixer
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include \
 					$(LOCAL_PATH)/../mad/include $(LOCAL_PATH)/../flac/include $(LOCAL_PATH)/../ogg/include \
 					$(LOCAL_PATH)/../vorbis/include $(LOCAL_PATH)/../tremor/include $(LOCAL_PATH)/../mikmod/include \
 					$(LOCAL_PATH)/timidity 
@@ -18,7 +18,7 @@ LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 LOCAL_STATIC_LIBRARIES := flac mikmod
 
 LOCAL_LDLIBS := -llog
@@ -43,7 +43,7 @@ include $(CLEAR_VARS)
 
 # Separate timidity, so it won't get rebuilt too often
 LOCAL_MODULE := timidity_sdl_mixer
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/timidity $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/timidity $(LOCAL_PATH)/../sdl-1.2/include
 LOCAL_CFLAGS := -O3
 LOCAL_SRC_FILES := $(addprefix timidity/, $(notdir $(wildcard $(LOCAL_PATH)/timidity/*.c)))
 #LOCAL_LDLIBS := -llog
diff --git a/project/jni/sdl_native_helpers/Android.mk b/project/jni/sdl_native_helpers/Android.mk
index 3295ce839..c1783d826 100644
--- a/project/jni/sdl_native_helpers/Android.mk
+++ b/project/jni/sdl_native_helpers/Android.mk
@@ -8,7 +8,7 @@ ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
 endif
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES :=
 LOCAL_CFLAGS := -DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) -DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\"
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/sdl_net/Android.mk b/project/jni/sdl_net/Android.mk
index 1e57637db..a14060090 100644
--- a/project/jni/sdl_net/Android.mk
+++ b/project/jni/sdl_net/Android.mk
@@ -4,14 +4,14 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_net
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_LDLIBS :=
 
diff --git a/project/jni/sdl_savepng/Android.mk b/project/jni/sdl_savepng/Android.mk
index 80636e03f..2c51097a3 100644
--- a/project/jni/sdl_savepng/Android.mk
+++ b/project/jni/sdl_savepng/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_savepng
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../png/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../png/include $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
@@ -12,6 +12,6 @@ LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 LOCAL_STATIC_LIBRARIES := png
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/project/jni/sdl_sound/Android.mk b/project/jni/sdl_sound/Android.mk
index e6ee8a6dc..0c5908928 100644
--- a/project/jni/sdl_sound/Android.mk
+++ b/project/jni/sdl_sound/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_sound
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include $(LOCAL_PATH)/decoders $(LOCAL_PATH)/decoders/mpglib \
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/include $(LOCAL_PATH)/decoders $(LOCAL_PATH)/decoders/mpglib \
 					$(LOCAL_PATH)/../flac/include $(LOCAL_PATH)/../ogg/include \
 					$(LOCAL_PATH)/../vorbis/include $(LOCAL_PATH)/../tremor/include $(LOCAL_PATH)/../mikmod/include \
 					$(LOCAL_PATH)/timidity
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) \
 					$(addprefix decoders/, $(notdir $(wildcard $(LOCAL_PATH)/decoders/*.c))) \
 					$(addprefix decoders/mpglib/, $(notdir $(wildcard $(LOCAL_PATH)/decoders/mpglib/*.c)))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 LOCAL_STATIC_LIBRARIES := flac mikmod vorbis ogg
 
 LOCAL_LDLIBS :=
diff --git a/project/jni/sdl_ttf/Android.mk b/project/jni/sdl_ttf/Android.mk
index 3a2cf2739..cf6e17f3e 100644
--- a/project/jni/sdl_ttf/Android.mk
+++ b/project/jni/sdl_ttf/Android.mk
@@ -4,14 +4,14 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_ttf
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/../freetype/include $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-1.2/include $(LOCAL_PATH)/../freetype/include $(LOCAL_PATH)/include
 LOCAL_CFLAGS := -Os
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := SDL_ttf.c
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := sdl-1.2
 LOCAL_STATIC_LIBRARIES := freetype
 LOCAL_LDLIBS := -lz
 
diff --git a/project/jni/zzip/Android.mk b/project/jni/zzip/Android.mk
index 06b9bce7a..a54159674 100644
--- a/project/jni/zzip/Android.mk
+++ b/project/jni/zzip/Android.mk
@@ -7,7 +7,7 @@ LOCAL_MODULE := zzip
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/zzip -type d))
 
 LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
-					$(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+					$(LOCAL_PATH)/include $(LOCAL_PATH)/../$(strip $(if $(filter 1.2, $(SDL_VERSION)), sdl-1.2, SDL2))/include
 LOCAL_CFLAGS := -O3
 
 
@@ -16,7 +16,7 @@ LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES := $(if $(filter 1.2, $(SDL_VERSION)), sdl-1.2, SDL2)
 
 LOCAL_STATIC_LIBRARIES :=