diff options
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r-- | scripts/toolchain.lua | 99 |
1 files changed, 9 insertions, 90 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 137a873ae09..79af9a8c4c6 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -27,8 +27,6 @@ newoption { { "mingw32-gcc", "MinGW32" }, { "mingw64-gcc", "MinGW64" }, { "mingw-clang", "MinGW (clang compiler)" }, - { "nacl", "Native Client" }, - { "nacl-arm", "Native Client - ARM" }, { "netbsd", "NetBSD" }, { "os2", "OS/2" }, { "osx", "OSX (GCC compiler)" }, @@ -253,44 +251,6 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw-clang") end - if "nacl" == _OPTIONS["gcc"] then - - if not os.getenv("NACL_SDK_ROOT") then - print("Set NACL_SDK_ROOT enviroment variables.") - end - - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_x86_newlib/bin/x86_64-nacl-" - if os.is("macosx") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_x86_newlib/bin/x86_64-nacl-" - elseif os.is("linux") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_x86_newlib/bin/x86_64-nacl-" - end - - premake.gcc.cc = naclToolchain .. "gcc" - premake.gcc.cxx = naclToolchain .. "g++" - premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-nacl") - end - - if "nacl-arm" == _OPTIONS["gcc"] then - - if not os.getenv("NACL_SDK_ROOT") then - print("Set NACL_SDK_ROOT enviroment variables.") - end - - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_arm_newlib/bin/arm-nacl-" - if os.is("macosx") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_arm_newlib/bin/arm-nacl-" - elseif os.is("linux") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_arm_newlib/bin/arm-nacl-" - end - - premake.gcc.cc = naclToolchain .. "gcc" - premake.gcc.cxx = naclToolchain .. "g++" - premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-nacl-arm") - end - if "osx" == _OPTIONS["gcc"] then if os.is("linux") then premake.gcc.cc = toolchainPrefix .. "clang" @@ -669,7 +629,7 @@ function toolchain(_buildDir, _subDir) configuration { "android-*" } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include", "$(ANDROID_NDK_ROOT)/sources/android/native_app_glue", } linkoptions { @@ -712,11 +672,11 @@ function toolchain(_buildDir, _subDir) targetdir (_buildDir .. "android-arm" .. "/bin") objdir (_buildDir .. "android-arm" .. "/obj") libdirs { - "$(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", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib", } 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)/platforms/" .. androidPlatform .. "/arch-arm/usr/include", } buildoptions { @@ -738,11 +698,11 @@ function toolchain(_buildDir, _subDir) targetdir (_buildDir .. "android-mips" .. "/bin") objdir (_buildDir .. "android-mips" .. "/obj") libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/include", } buildoptions { @@ -758,11 +718,11 @@ function toolchain(_buildDir, _subDir) targetdir (_buildDir .. "android-x86" .. "/bin") objdir (_buildDir .. "android-x86" .. "/obj") libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/include", } buildoptions { @@ -801,7 +761,7 @@ function toolchain(_buildDir, _subDir) "-Wno-extern-c-compat", } - configuration { "nacl or nacl-arm or pnacl" } + configuration { "pnacl" } buildoptions { "-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,... "-fno-stack-protector", @@ -810,12 +770,7 @@ function toolchain(_buildDir, _subDir) "-ffunction-sections", "-Wunused-value", } - configuration { "nacl or nacl-arm" } - includedirs { - "$(NACL_SDK_ROOT)/include", - "$(NACL_SDK_ROOT)/include/newlib", - } - + configuration { "pnacl" } buildoptions { "-Wno-tautological-undefined-compare", @@ -826,36 +781,6 @@ function toolchain(_buildDir, _subDir) "$(NACL_SDK_ROOT)/include/pnacl", } - configuration { "x32", "nacl" } - targetdir (_buildDir .. "nacl-x86" .. "/bin/x32") - objdir (_buildDir .. "nacl-x86" .. "/obj") - - configuration { "x32", "nacl", "Debug" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Debug" } - - configuration { "x32", "nacl", "Release" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" } - - configuration { "x64", "nacl" } - targetdir (_buildDir .. "nacl-x64" .. "/bin/x64") - objdir (_buildDir .. "nacl-x64" .. "/obj") - - configuration { "x64", "nacl", "Debug" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Debug" } - - configuration { "x64", "nacl", "Release" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Release" } - - configuration { "nacl-arm" } - targetdir (_buildDir .. "nacl-arm" .. "/bin") - objdir (_buildDir .. "nacl-arm" .. "/obj") - - configuration { "nacl-arm", "Debug" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" } - - configuration { "nacl-arm", "Release" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" } - configuration { "pnacl" } targetdir (_buildDir .. "pnacl" .. "/bin") objdir (_buildDir .. "pnacl" .. "/obj") @@ -971,12 +896,6 @@ function strip() "$(SILENT) " .. naclToolchain .. "finalize \"$(TARGET)\"" } - configuration { "*nacl*", "Release" } - postbuildcommands { - "$(SILENT) echo Stripping symbols.", - "$(SILENT) " .. naclToolchain .. "strip -s \"$(TARGET)\"" - } - configuration { "asmjs" } postbuildcommands { "$(SILENT) echo Running asmjs finalize.", |