Browse Source

Use GCC built-in atomic functions instead of inline assembly on Android. This fixes SDL armeabi build failing on release mode.

Lasse Öörni 12 years ago
parent
commit
d5e4b732e9
2 changed files with 4 additions and 1 deletions
  1. 0 1
      ThirdParty/SDL/CMakeLists.txt
  2. 4 0
      ThirdParty/SDL/include/SDL_config_android.h

+ 0 - 1
ThirdParty/SDL/CMakeLists.txt

@@ -38,7 +38,6 @@ elseif (ANDROID)
         src/audio/android/*.c src/core/android/*.cpp src/joystick/android/*.c src/loadso/dlopen/*.c
         src/audio/android/*.c src/core/android/*.cpp src/joystick/android/*.c src/loadso/dlopen/*.c
         src/thread/pthread/*.c src/timer/unix/*.c src/video/android/*.c
         src/thread/pthread/*.c src/timer/unix/*.c src/video/android/*.c
     )
     )
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wa,-mimplicit-it=thumb")
 else ()
 else ()
     include(CheckCSourceCompiles)
     include(CheckCSourceCompiles)
 
 

+ 4 - 0
ThirdParty/SDL/include/SDL_config_android.h

@@ -19,6 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
 
 
+// Modified by Lasse Oorni for Urho3D
+
 #ifndef _SDL_config_android_h
 #ifndef _SDL_config_android_h
 #define _SDL_config_android_h
 #define _SDL_config_android_h
 
 
@@ -101,6 +103,8 @@
 #define HAVE_SETJMP 1
 #define HAVE_SETJMP 1
 #define HAVE_NANOSLEEP  1
 #define HAVE_NANOSLEEP  1
 #define HAVE_SYSCONF    1
 #define HAVE_SYSCONF    1
+// Urho3D: enable use of GCC atomics
+#define HAVE_GCC_ATOMICS 1
 
 
 #define SIZEOF_VOIDP 4
 #define SIZEOF_VOIDP 4