[Android] Enable hard-float support. Requires Android NDK r9b.

dolphin-emu · Nov 24, 2013 · 2c09e8f · 2c09e8f
1 parent 13578dc
commit 2c09e8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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"