diff options
author | 2016-03-20 16:48:03 +0100 | |
---|---|---|
committer | 2016-03-20 16:50:14 +0100 | |
commit | fae7a2c486127fe74ee027429312cc29e350b8ef (patch) | |
tree | a78646513eea09779b2c2911231bfa68652e485f /3rdparty/bx/scripts/toolchain.lua | |
parent | 3a60b4bb7a19f1987745d3302f1b330d12d48d25 (diff) |
Update to latest BGFX and BX(nw)
Diffstat (limited to '3rdparty/bx/scripts/toolchain.lua')
-rw-r--r-- | 3rdparty/bx/scripts/toolchain.lua | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/3rdparty/bx/scripts/toolchain.lua b/3rdparty/bx/scripts/toolchain.lua index 0cabfae5a9d..e87e5f3b236 100644 --- a/3rdparty/bx/scripts/toolchain.lua +++ b/3rdparty/bx/scripts/toolchain.lua @@ -47,6 +47,7 @@ function toolchain(_buildDir, _libDir) allowed = { { "vs2012-clang", "Clang 3.6" }, { "vs2013-clang", "Clang 3.6" }, + { "vs2015-clang", "Clang 3.9" }, { "vs2012-xp", "Visual Studio 2012 targeting XP" }, { "vs2013-xp", "Visual Studio 2013 targeting XP" }, { "vs2015-xp", "Visual Studio 2015 targeting XP" }, @@ -339,7 +340,11 @@ function toolchain(_buildDir, _libDir) elseif _ACTION == "vs2012" or _ACTION == "vs2013" or _ACTION == "vs2015" then if (_ACTION .. "-clang") == _OPTIONS["vs"] then - premake.vstudio.toolset = ("LLVM-" .. _ACTION) + if "vs2015-clang" == _OPTIONS["vs"] then + premake.vstudio.toolset = ("LLVM-vs2014") + else + premake.vstudio.toolset = ("LLVM-" .. _ACTION) + end location (path.join(_buildDir, "projects", _ACTION .. "-clang")) elseif "winphone8" == _OPTIONS["vs"] then @@ -746,10 +751,11 @@ function toolchain(_buildDir, _libDir) objdir (path.join(_buildDir, "android-arm/obj")) libdirs { 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 { - "$(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 { "--sysroot=" .. path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm"), |