From 2dff12fa282786fbf369f5cd5150ea6466d59234 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Mon, 2 Dec 2013 19:45:52 -0800 Subject: [PATCH] Android: Updated toolchain. --- premake/toolchain.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/premake/toolchain.lua b/premake/toolchain.lua index 564c873..96c7166 100755 --- a/premake/toolchain.lua +++ b/premake/toolchain.lua @@ -369,7 +369,7 @@ function toolchain(_buildDir, _libDir) "NoImportLib", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/include", "$(ANDROID_NDK_ROOT)/sources/android/native_app_glue", } linkoptions { @@ -395,10 +395,10 @@ function toolchain(_buildDir, _libDir) objdir (_buildDir .. "android-arm" .. "/obj") libdirs { _libDir .. "lib/android-arm", - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include", } linkoptions { "--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm", @@ -427,10 +427,10 @@ function toolchain(_buildDir, _libDir) objdir (_buildDir .. "android-mips" .. "/obj") libdirs { _libDir .. "lib/android-mips", - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/mips", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/mips/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include", } linkoptions { "--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-mips", @@ -446,10 +446,10 @@ function toolchain(_buildDir, _libDir) objdir (_buildDir .. "android-x86" .. "/obj") libdirs { _libDir .. "lib/android-x86", - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/x86", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.7/libs/x86/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include", } linkoptions { "--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-x86",