From 8363d283bdaade7a593ed6b338de471f3fd1802e Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Wed, 17 Apr 2013 22:18:42 -0700
Subject: [PATCH] Fixed Android toolchain settings.

---
 include/bx/macros.h       |  2 +-
 include/bx/readerwriter.h |  2 +-
 premake/toolchain.lua     | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/include/bx/macros.h b/include/bx/macros.h
index 08569ba..0dc4c60 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -99,7 +99,7 @@
 #endif // BX_CONFIG_SPSCQUEUE_USE_MUTEX
 
 #ifndef BX_CONFIG_CRT_FILE_READER_WRITER
-#	define BX_CONFIG_CRT_FILE_READER_WRITER BX_PLATFORM_WINDOWS|BX_PLATFORM_LINUX|BX_PLATFORM_OSX|BX_PLATFORM_QNX
+#	define BX_CONFIG_CRT_FILE_READER_WRITER BX_PLATFORM_ANDROID|BX_PLATFORM_LINUX|BX_PLATFORM_OSX|BX_PLATFORM_QNX|BX_PLATFORM_WINDOWS
 #endif // BX_CONFIG_CRT_FILE_READER_WRITER
 
 #endif // __BX_MACROS_H__
diff --git a/include/bx/readerwriter.h b/include/bx/readerwriter.h
index ff01213..29a5cda 100644
--- a/include/bx/readerwriter.h
+++ b/include/bx/readerwriter.h
@@ -15,7 +15,7 @@
 #if BX_COMPILER_MSVC
 #	define fseeko64 _fseeki64
 #	define ftello64 _ftelli64
-#elif BX_PLATFORM_OSX
+#elif BX_PLATFORM_ANDROID|BX_PLATFORM_OSX|BX_PLATFORM_QNX
 #	define fseeko64 fseeko
 #	define ftello64 ftello
 #endif // BX_
diff --git a/premake/toolchain.lua b/premake/toolchain.lua
index 36659a7..4ebad97 100755
--- a/premake/toolchain.lua
+++ b/premake/toolchain.lua
@@ -268,20 +268,26 @@ function toolchain(_buildDir, _libDir)
 		}
 		libdirs {
 			_libDir .. "lib/android-arm",
-			"$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm/usr/lib",
 			"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a",
 		}
 		includedirs {
-			"$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm/usr/include",
 			"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/include",
 			"$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include",
 		}
 		linkoptions {
+			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm",
+			"-nostdlib",
 			"$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm/usr/lib/crtbegin_so.o",
+			"$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm/usr/lib/crtend_so.o",
+			"-march=armv7-a",
+			"-Wl,-shared,-Bsymbolic",
 			"-Wl,--gc-sections",
+			"-Wl,--fix-cortex-a8",
+			"-static-libgcc",
 		}
 		links {
 			"c",
+			"m",
 			"android",
 			"gnustl_static",
 		}
@@ -290,6 +296,11 @@ function toolchain(_buildDir, _libDir)
 			"-U__STRICT_ANSI__",
 			"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
 			"-fPIC",
+			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm",
+			"-mthumb",
+			"-march=armv7-a",
+			"-mfloat-abi=softfp",
+			"-mfpu=vfpv3-d16",
 		}
 
 	configuration { "emscripten" }