diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-24 16:43:53 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-24 16:43:53 -0600 |
| commit | 2c09e8fc5a2bb6ea358d779ce523d44e1b7dcdce (patch) | |
| tree | 64453442da3edd33d3205103af9369dd190580f8 | |
| parent | 13578dc0b3d8797bc82d69d346c3af0d90345206 (diff) | |
[Android] Enable hard-float support. Requires Android NDK r9b.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ea0510baf..74c254b68b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,6 +289,10 @@ if(ANDROID) set(USE_WAYLAND 0) set(USE_UPNP 0) set(USE_GLES3 1) + if(ANDROID_NDK_ABI_NAME STREQUAL "armeabi-v7a") + message("Enabling hard-float") + add_definitions(-mhard-float) + endif() endif() # For now GLES and EGL are tied to each other. diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 23fb8d64f7..a35f1ba1ce 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -187,6 +187,7 @@ if(ANDROID) target_link_libraries(${DOLPHIN_EXE} log android + "-Wl,--no-warn-mismatch" "-Wl,--whole-archive" ${LIBS} "-Wl,--no-whole-archive" |