diff --git a/README.txt b/README.txt index 2bf05f2..592e396 100644 --- a/README.txt +++ b/README.txt @@ -34,6 +34,9 @@ newer version with the help of the SDL community. If anybody figures this out before the end of Summer I'd be very grateful. If not I'll be back to take care of it myself ;) +Here's a link to the version I use, in case you're having trouble: +http://dl.dropbox.com/u/4522570/jni.tar.gz + COMPILING --------------- There is a Code::Blocks project for compiling on Linux. Compiling for Android is diff --git a/jni/SDL_image/Android.mk b/jni/SDL_image/Android.mk index a05662b..556805d 100644 --- a/jni/SDL_image/Android.mk +++ b/jni/SDL_image/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := SDL2_image +LOCAL_MODULE := SDL_image LOCAL_CFLAGS := -I$(LOCAL_PATH)/../jpeg -I$(LOCAL_PATH)/../png -I$(LOCAL_PATH)/../SDL/include \ -DLOAD_JPG -DLOAD_PNG -DLOAD_BMP -DLOAD_GIF -DLOAD_LBM \ @@ -11,7 +11,7 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH)/../jpeg -I$(LOCAL_PATH)/../png -I$(LOCAL_PATH)/. LOCAL_SRC_FILES := $(notdir $(filter-out %/showimage.c, $(wildcard $(LOCAL_PATH)/*.c))) -LOCAL_SHARED_LIBRARIES := SDL2 +LOCAL_SHARED_LIBRARIES := SDL LOCAL_STATIC_LIBRARIES := png jpeg diff --git a/jni/SDL_mixer/Android.mk b/jni/SDL_mixer/Android.mk index 6adb8fe..930b98e 100644 --- a/jni/SDL_mixer/Android.mk +++ b/jni/SDL_mixer/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := SDL2_mixer +LOCAL_MODULE := SDL_mixer LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/.. \ @@ -13,7 +13,7 @@ LOCAL_CFLAGS := -DWAV_MUSIC -DOGG_MUSIC -DOGG_USE_TREMOR -DMOD_MUSIC LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/*.c))) -LOCAL_SHARED_LIBRARIES := SDL2 mikmod +LOCAL_SHARED_LIBRARIES := SDL mikmod LOCAL_STATIC_LIBRARIES := tremor include $(BUILD_SHARED_LIBRARY) diff --git a/jni/SDL_ttf/Android.mk b/jni/SDL_ttf/Android.mk index a57204c..b4d27dc 100644 --- a/jni/SDL_ttf/Android.mk +++ b/jni/SDL_ttf/Android.mk @@ -2,13 +2,13 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := SDL2_ttf +LOCAL_MODULE := SDL_ttf LOCAL_CFLAGS := -I$(LOCAL_PATH)/../SDL/include -I$(LOCAL_PATH)/../freetype/include LOCAL_SRC_FILES := SDL_ttf.c -LOCAL_SHARED_LIBRARIES := SDL2 +LOCAL_SHARED_LIBRARIES := SDL LOCAL_STATIC_LIBRARIES := freetype