瀏覽代碼

Android: Updated toolchain.

bkaradzic 12 年之前
父節點
當前提交
2dff12fa28
共有 1 個文件被更改,包括 7 次插入7 次删除
  1. 7 7
      premake/toolchain.lua

+ 7 - 7
premake/toolchain.lua

@@ -369,7 +369,7 @@ function toolchain(_buildDir, _libDir)
 			"NoImportLib",
 			"NoImportLib",
 		}
 		}
 		includedirs {
 		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",
 			"$(ANDROID_NDK_ROOT)/sources/android/native_app_glue",
 		}
 		}
 		linkoptions {
 		linkoptions {
@@ -395,10 +395,10 @@ function toolchain(_buildDir, _libDir)
 		objdir (_buildDir .. "android-arm" .. "/obj")
 		objdir (_buildDir .. "android-arm" .. "/obj")
 		libdirs {
 		libdirs {
 			_libDir .. "lib/android-arm",
 			_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 {
 		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 {
 		linkoptions {
 			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm",
 			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-arm",
@@ -427,10 +427,10 @@ function toolchain(_buildDir, _libDir)
 		objdir (_buildDir .. "android-mips" .. "/obj")
 		objdir (_buildDir .. "android-mips" .. "/obj")
 		libdirs {
 		libdirs {
 			_libDir .. "lib/android-mips",
 			_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 {
 		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 {
 		linkoptions {
 			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-mips",
 			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-mips",
@@ -446,10 +446,10 @@ function toolchain(_buildDir, _libDir)
 		objdir (_buildDir .. "android-x86" .. "/obj")
 		objdir (_buildDir .. "android-x86" .. "/obj")
 		libdirs {
 		libdirs {
 			_libDir .. "lib/android-x86",
 			_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 {
 		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 {
 		linkoptions {
 			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-x86",
 			"--sysroot=$(ANDROID_NDK_ROOT)/platforms/android-14/arch-x86",