|
@@ -751,10 +751,11 @@ function toolchain(_buildDir, _libDir)
|
|
|
objdir (path.join(_buildDir, "android-arm/obj"))
|
|
objdir (path.join(_buildDir, "android-arm/obj"))
|
|
|
libdirs {
|
|
libdirs {
|
|
|
path.join(_libDir, "lib/android-arm"),
|
|
path.join(_libDir, "lib/android-arm"),
|
|
|
- "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a",
|
|
|
|
|
|
|
+ "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a",
|
|
|
}
|
|
}
|
|
|
includedirs {
|
|
includedirs {
|
|
|
- "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include",
|
|
|
|
|
|
|
+ "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include",
|
|
|
|
|
+ "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include",
|
|
|
}
|
|
}
|
|
|
buildoptions {
|
|
buildoptions {
|
|
|
"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm"),
|
|
"--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm"),
|