Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-18 04:53:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Android toolchain settings.

Browse Source
This commit is contained in:
bkaradzic
2013-04-17 22:18:42 -07:00
parent 2f8e58f6dc
commit 8363d283bd
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bx/macros.h
View File

@@ -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__

2
include/bx/readerwriter.h
View File

@@ -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_

15
premake/toolchain.lua
View File

@@ -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" }