Browse Source

Fixed SDL thumb mode inline assembly when compiling in release mode with the Android toolchain.

Lasse Öörni 12 years ago
parent
commit
61a8f4a98f
3 changed files with 3 additions and 2 deletions
  1. 1 0
      ThirdParty/SDL/CMakeLists.txt
  2. 1 1
      cmake_android.bat
  3. 1 1
      cmake_android.sh

+ 1 - 0
ThirdParty/SDL/CMakeLists.txt

@@ -38,6 +38,7 @@ 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)
 
 

+ 1 - 1
cmake_android.bat

@@ -1,2 +1,2 @@
 @del /F CMakeCache.txt
 @del /F CMakeCache.txt
-cmake -G "Unix Makefiles" -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=Android/android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=Android
+cmake -G "Unix Makefiles" -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=Android/android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=Android  -DCMAKE_BUILD_TYPE=Release

+ 1 - 1
cmake_android.sh

@@ -1,3 +1,3 @@
 rm -f CMakeCache.txt
 rm -f CMakeCache.txt
-cmake -G "Unix Makefiles" -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=Android/android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=Android $@
+cmake -G "Unix Makefiles" -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=Android/android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=Android -DCMAKE_BUILD_TYPE=Release $@
 sed -i.bak 's/OpenGL/Direct3D9/g' Doxyfile
 sed -i.bak 's/OpenGL/Direct3D9/g' Doxyfile