Browse Source

Using static linking for SDL2

fysx 12 years ago
parent
commit
89c54f9712
2 changed files with 4 additions and 4 deletions
  1. 2 2
      jni/SDL2-2.0.1/Android.mk
  2. 2 2
      jni/love/Android.mk

+ 2 - 2
jni/SDL2-2.0.1/Android.mk

@@ -48,7 +48,7 @@ LOCAL_SRC_FILES := \
 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
 
-include $(BUILD_SHARED_LIBRARY)
+# include $(BUILD_SHARED_LIBRARY)
 
 ###########################
 #
@@ -60,7 +60,7 @@ LOCAL_MODULE := SDL2_static
 
 LOCAL_MODULE_FILENAME := libSDL2
 
-LOCAL_SRC_FILES += $(LOCAL_PATH)/src/main/android/SDL_android_main.c
+LOCAL_SRC_FILES += src/main/android/SDL_android_main.c
 
 LOCAL_LDLIBS := 
 LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid

+ 2 - 2
jni/love/Android.mk

@@ -97,9 +97,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_CXXFLAGS := -std=c++0x
 
-LOCAL_SHARED_LIBRARIES := SDL2 libphysfs libvorbis libogg libopenal libmpg123 libmodplug libdevil libtiff libmng libfreetype liblcms libjasper libpng libjpeg
+LOCAL_SHARED_LIBRARIES := libphysfs libvorbis libogg libopenal libmpg123 libmodplug libdevil libtiff libmng libfreetype liblcms libjasper libpng libjpeg
 
-LOCAL_STATIC_LIBRARIES := libluajit
+LOCAL_STATIC_LIBRARIES := libluajit SDL2_static
 
 # $(info liblove: include dirs $(LOCAL_C_INCLUDES))
 # $(info liblove: src files $(LOCAL_SRC_FILES))