Updated SDL to version 2.0.5

This commit is contained in:
Martin Felis
2016-10-22 22:10:28 +02:00
parent 2358b45c27
commit 6dedec28a2
1815 changed files with 17867 additions and 7581 deletions
+2 -2
View File
@@ -16,7 +16,7 @@ LOCAL_C_INCLUDES := \
${LOCAL_PATH}/src/modules \
${LOCAL_PATH}/src/libraries/ \
${LOCAL_PATH}/src/libraries/enet/libenet/include \
${LOCAL_PATH}/../SDL2-2.0.4/include \
${LOCAL_PATH}/../SDL2-2.0.5/include \
${LOCAL_PATH}/../jasper-1.900.1/src/libjasper/include \
${LOCAL_PATH}/../libmng-1.0.10/ \
${LOCAL_PATH}/../lcms2-2.5/include \
@@ -107,7 +107,7 @@ LOCAL_STATIC_LIBRARIES := libphysfs libvorbis libogg libtheora libmodplug libfre
# $(info liblove: include dirs $(LOCAL_C_INCLUDES))
# $(info liblove: src files $(LOCAL_SRC_FILES))
SDL_PATH := ../SDL2-2.0.4
SDL_PATH := ../SDL2-2.0.5
LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c
LOCAL_LDLIBS := -lz -lGLESv1_CM -lGLESv2 -ldl -landroid
LOCAL_LDFLAGS := -Wl,--allow-multiple-definition