encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3789 - Android : small clean up 

Sylvain

Since https://hg.libsdl.org/SDL/rev/6546daa45a02
SDL_android_main.c is empty and then produce a warning
nativeInit does not exist and dont need to be mark undefined
This commit is contained in:
Sam Lantinga 2017-08-30 14:25:01 -07:00
parent b5f31c392d
commit 347fe70432
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@ -61,10 +61,8 @@ LOCAL_MODULE := SDL2_static
LOCAL_MODULE_FILENAME := libSDL2 LOCAL_MODULE_FILENAME := libSDL2
LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c)
LOCAL_LDLIBS := LOCAL_LDLIBS :=
LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid LOCAL_EXPORT_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -82,8 +80,6 @@ LOCAL_MODULE := SDL2_main
LOCAL_MODULE_FILENAME := libSDL2main LOCAL_MODULE_FILENAME := libSDL2main
LOCAL_SRC_FILES := $(LOCAL_PATH)/src/main/android/SDL_android_main.c
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

1
CMakeLists.txt
View File

@ -876,7 +876,6 @@ if(ANDROID)
CheckPTHREAD() CheckPTHREAD()
list(APPEND EXTRA_LDFLAGS "-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit")
endif() endif()
# Platform-specific options and settings # Platform-specific options and settings

3
android-project/jni/src/Android.mk
View File

@ -9,8 +9,7 @@ SDL_PATH := ../SDL
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
# Add your application source files here... # Add your application source files here...
LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \ LOCAL_SRC_FILES := YourSourceHere.c
YourSourceHere.c
LOCAL_SHARED_LIBRARIES := SDL2 LOCAL_SHARED_LIBRARIES := SDL2