From 2c09e8fc5a2bb6ea358d779ce523d44e1b7dcdce Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 24 Nov 2013 16:43:53 -0600
Subject: [PATCH] [Android] Enable hard-float support. Requires Android NDK
 r9b.

---
 CMakeLists.txt                       | 4 ++++
 Source/Core/DolphinWX/CMakeLists.txt | 1 +
 2 files changed, 5 insertions(+)

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"