Merge pull request #93 from Nodrev/bugfix-android-toolchain

Fixing android-x86 build
This commit is contained in:
Branimir Karadžić
2016-02-20 09:02:31 -08:00

View File

@@ -800,7 +800,7 @@ function toolchain(_buildDir, _libDir)
linkoptions {
"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-x86"),
path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-x86/usr/lib/crtbegin_so.o"),
path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "/arch-x86/usr/lib/crtend_so.o"),
path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-x86/usr/lib/crtend_so.o"),
}
configuration { "asmjs" }