We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Enable CMake builds for Android

android_cmake.patch (text/plain), 5.15 KB, created by sfalexrog on 2017-10-24 12:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sfalexrog

Created: 2017-10-24 12:54:42 UTC

Size: 5.15 KB

patch

obsolete

>diff -r 4130b92b6be4 CMakeLists.txt
>--- a/CMakeLists.txt	Tue Oct 24 00:17:07 2017 -0700
>+++ b/CMakeLists.txt	Tue Oct 24 15:52:08 2017 +0300
>@@ -48,10 +48,10 @@
> set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
> 
> # Set defaults preventing destination file conflicts
>-set(CMAKE_DEBUG_POSTFIX "d"
>+set(SDL_CMAKE_DEBUG_POSTFIX "d"
>     CACHE STRING "Name suffix for debug builds")
> 
>-mark_as_advanced(CMAKE_IMPORT_LIBRARY_SUFFIX CMAKE_DEBUG_POSTFIX)
>+mark_as_advanced(CMAKE_IMPORT_LIBRARY_SUFFIX SDL_CMAKE_DEBUG_POSTFIX)
> 
> # Calculate a libtool-like version number
> math(EXPR LT_CURRENT "${SDL_MICRO_VERSION} - ${SDL_INTERFACE_AGE}")
>@@ -1689,7 +1689,7 @@
> 
> # Always build SDLmain
> add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
>-target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include>)
>+target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
> set(_INSTALL_LIBS "SDL2main")
> 
> if(SDL_SHARED)
>@@ -1715,7 +1715,7 @@
>   endif()
>   set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
>   target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
>-  target_include_directories(SDL2 PUBLIC $<INSTALL_INTERFACE:include>)
>+  target_include_directories(SDL2 PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
> endif()
> 
> if(SDL_STATIC)
>@@ -1738,7 +1738,14 @@
>   # libraries - do we need to consider this?
>   set(_INSTALL_LIBS "SDL2-static" ${_INSTALL_LIBS})
>   target_link_libraries(SDL2-static ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
>-  target_include_directories(SDL2-static PUBLIC $<INSTALL_INTERFACE:include>)
>+  target_include_directories(SDL2-static PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
>+endif()
>+
>+# Add debug postfix for non-Android targets
>+if (NOT ANDROID)
>+    set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
>+    set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
>+    set_target_properties(SDL2-static PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
> endif()
> 
> ##### Installation targets #####
>diff -r 4130b92b6be4 android-project/app/build.gradle
>--- a/android-project/app/build.gradle	Tue Oct 24 00:17:07 2017 -0700
>+++ b/android-project/app/build.gradle	Tue Oct 24 15:52:08 2017 +0300
>@@ -13,6 +13,11 @@
>             ndkBuild {
>                 arguments "APP_PLATFORM=android-14"
>             }
>+            // Uncomment to pass additional arguments to CMake
>+            // Note that you can only use ONE build system at a time
>+            //cmake {
>+            //    arguments "-DANDROID_APP_PLATFORM=android-14" //, "-DANDROID_STL=c++_static"
>+            //}
>         }
>         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
>     }
>@@ -29,6 +34,11 @@
>         ndkBuild {
>             path 'jni/Android.mk'
>         }
>+        // Uncomment to use CMake support
>+        // Note that you can only use ONE build system at a time
>+        //cmake {
>+        //    path 'jni/CMakeLists.txt'
>+        //}
>     }
>     lintOptions {
>         abortOnError false
>diff -r 4130b92b6be4 android-project/app/jni/CMakeLists.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android-project/app/jni/CMakeLists.txt	Tue Oct 24 15:52:08 2017 +0300
>@@ -0,0 +1,10 @@
>+# Android Studio has CMake 3.6 bundled, but this file could probably be used for
>+# other platforms
>+cmake_minimum_required(VERSION 3.4)
>+project(GAME)
>+
>+# This file assumes you've placed (a link to) SDL sources in a subfolder named "SDL"
>+add_subdirectory(SDL)
>+# Your game's CMakeLists.txt should be placed in a folder named "src" (or you could
>+# point the next command to whatever the name of the folder is)
>+add_subdirectory(src)
>diff -r 4130b92b6be4 android-project/app/jni/src/CMakeLists.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android-project/app/jni/src/CMakeLists.txt	Tue Oct 24 15:52:08 2017 +0300
>@@ -0,0 +1,46 @@
>+cmake_minimum_required(VERSION 3.4)
>+project(GAME_PROPER)
>+
>+# This file should be added by the ../CMakeLists.txt file,
>+# so there are targets named SDL2 and SDL2main that you can use
>+
>+# Note that adding a target without sources generates a warning. This is harmless
>+# and will hopefully be removed in a later CMake release.
>+if (ANDROID)
>+    add_library(main SHARED)
>+else()
>+    add_executable(main)
>+endif()
>+
>+# Specify your sources here
>+target_sources(main
>+    PRIVATE
>+    yourfilehere.c
>+    )
>+
>+# Android comes with a minimal set of libraries that you can
>+# link against. They can be found with calls to find_library()
>+# (Note that SDL2 itself links against android, dl, log, GLESv1 and GLESv2)
>+if (ANDROID)
>+    find_library(EGL_LIB EGL)
>+    find_library(LOG_LIB log)
>+    find_library(GLESv1_LIB GLESv1_CM)
>+    find_library(GLESv2_LIB GLESv2)
>+    find_library(ANDROID_LIB android)
>+    target_link_libraries(main
>+        PRIVATE
>+        ${EGL_LIB}
>+        ${LOG_LIB}
>+        ${GLESv1_LIB}
>+        ${GLESv2_LIB}
>+        ${ANDROID_LIB})
>+endif()
>+
>+# Specify the libraries you link against here
>+# (Note that linking against SDL2 will add the required include directories)
>+target_link_libraries(
>+    main
>+    PRIVATE
>+    SDL2
>+    SDL2main
>+    )

Actions: View | Diff

Attachments on bug 3918: 3039 | 3040

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.