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] Fix for this issue

android_cmake_fixes2.patch (text/plain), 3.11 KB, created by Olli Kallioinen on 2017-06-08 19:19:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Kallioinen

Created: 2017-06-08 19:19:23 UTC

Size: 3.11 KB

patch

obsolete

># HG changeset patch
># User Olli Kallioinen <olli.kallioinen@iki.fi>
># Date 1496948875 -10800
>#      Thu Jun 08 22:07:55 2017 +0300
># Node ID 9ad23ed362fd827e4d59d0b4be60df8946c84ba9
># Parent  8a29b371e2db891d0fef2f9c9bd95969c1c006cb
>Android build fixes
> -Enabling checking for GCC_ATOMICS also on clang by default. This way all Android ABIs build successfully
> -Android cmake: Threading was not enabled correctly
> -Android cmake: Timers and dynamic lib loading were not included in the sources
>
>diff -r 8a29b371e2db -r 9ad23ed362fd CMakeLists.txt
>--- a/CMakeLists.txt	Tue Jun 06 14:06:40 2017 -0400
>+++ b/CMakeLists.txt	Thu Jun 08 22:07:55 2017 +0300
>@@ -159,6 +159,10 @@
>   set(OPT_DEF_ASM FALSE)
> endif()
> 
>+if(USE_GCC OR USE_CLANG)
>+  set(OPT_DEF_GCC_ATOMICS ON)
>+endif()
>+
> # Default flags, if not set otherwise
> if("$ENV{CFLAGS}" STREQUAL "")
>   if(CMAKE_BUILD_TYPE STREQUAL "")
>@@ -257,7 +261,7 @@
> option_string(ASSERTIONS "Enable internal sanity checks (auto/disabled/release/enabled/paranoid)" "auto")
> #set_option(DEPENDENCY_TRACKING "Use gcc -MMD -MT dependency tracking" ON)
> set_option(LIBC                "Use the system C library" ${OPT_DEF_LIBC})
>-set_option(GCC_ATOMICS         "Use gcc builtin atomics" ${USE_GCC})
>+set_option(GCC_ATOMICS         "Use gcc builtin atomics" ${OPT_DEF_GCC_ATOMICS})
> set_option(ASSEMBLY            "Enable assembly routines" ${OPT_DEF_ASM})
> set_option(SSEMATH             "Allow GCC to use SSE floating point math" ${OPT_DEF_SSEMATH})
> set_option(MMX                 "Use MMX assembly routines" ${OPT_DEF_ASM})
>@@ -788,12 +792,24 @@
>     set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_JOYSTICK_SOURCES})
>     set(HAVE_SDL_JOYSTICK TRUE)
>   endif()
>+  if(SDL_LOADSO)
>+    set(SDL_LOADSO_DLOPEN 1)
>+    file(GLOB LOADSO_SOURCES ${SDL2_SOURCE_DIR}/src/loadso/dlopen/*.c)
>+    set(SOURCE_FILES ${SOURCE_FILES} ${LOADSO_SOURCES})
>+    set(HAVE_SDL_LOADSO TRUE)
>+  endif()
>   if(SDL_POWER)
>     set(SDL_POWER_ANDROID 1)
>     file(GLOB ANDROID_POWER_SOURCES ${SDL2_SOURCE_DIR}/src/power/android/*.c)
>     set(SOURCE_FILES ${SOURCE_FILES} ${ANDROID_POWER_SOURCES})
>     set(HAVE_SDL_POWER TRUE)
>   endif()
>+  if(SDL_TIMERS)
>+    set(SDL_TIMER_UNIX 1)
>+    file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/unix/*.c)
>+    set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
>+    set(HAVE_SDL_TIMERS TRUE)
>+  endif()
>   if(SDL_VIDEO)
>     set(SDL_VIDEO_DRIVER_ANDROID 1)
>     file(GLOB ANDROID_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/android/*.c)
>@@ -819,6 +835,9 @@
>       list(APPEND EXTRA_LIBS ${OpenGLES1_LIBRARY} ${OpenGLES2_LIBRARY})
>     endif()
>   endif()
>+
>+  CheckPTHREAD()
>+
>   list(APPEND EXTRA_LDFLAGS "-Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit")
> endif()
> 
>diff -r 8a29b371e2db -r 9ad23ed362fd cmake/sdlchecks.cmake
>--- a/cmake/sdlchecks.cmake	Tue Jun 06 14:06:40 2017 -0400
>+++ b/cmake/sdlchecks.cmake	Thu Jun 08 22:07:55 2017 +0300
>@@ -829,6 +829,8 @@
>     if(LINUX)
>       set(PTHREAD_CFLAGS "-D_REENTRANT")
>       set(PTHREAD_LDFLAGS "-pthread")
>+    elseif(ANDROID)
>+      # pthreads are builtin
>     elseif(BSDI)
>       set(PTHREAD_CFLAGS "-D_REENTRANT -D_THREAD_SAFE")
>       set(PTHREAD_LDFLAGS "")

Actions: View | Diff

Attachments on bug 3665: 2756 | 2757

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.