diff options
author | 2015-03-19 20:03:44 -0700 | |
---|---|---|
committer | 2015-03-19 20:03:44 -0700 | |
commit | e214162b02aec342b5586d2e181deec6fdf3965b (patch) | |
tree | 0d8c886b39c62cf5127555895fb1e9557adfac46 /3rdparty/bx/scripts/toolchain.lua | |
parent | 633ab90d90ed2ae50aeddff8471eb0d8e4b42104 (diff) | |
parent | 2fa8b8d6fe1267213bcb37b24a675421cbc73b3d (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to '3rdparty/bx/scripts/toolchain.lua')
-rw-r--r-- | 3rdparty/bx/scripts/toolchain.lua | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/3rdparty/bx/scripts/toolchain.lua b/3rdparty/bx/scripts/toolchain.lua index 5c2cf4c86e9..85f24e10746 100644 --- a/3rdparty/bx/scripts/toolchain.lua +++ b/3rdparty/bx/scripts/toolchain.lua @@ -298,12 +298,12 @@ function toolchain(_buildDir, _libDir) premake.vstudio.toolset = ("v110_xp") location (path.join(_buildDir, "projects", _ACTION .. "-xp")) end - + if ("vs2013-xp") == _OPTIONS["vs"] then premake.vstudio.toolset = ("v120_xp") location (path.join(_buildDir, "projects", _ACTION .. "-xp")) end - + elseif _ACTION == "xcode4" then if "osx" == _OPTIONS["xcode"] then @@ -414,7 +414,6 @@ function toolchain(_buildDir, _libDir) defines { "WIN32" } includedirs { path.join(bxDir, "include/compat/mingw") } buildoptions { - "-std=c++11", "-Wunused-value", "-fdata-sections", "-ffunction-sections", @@ -422,6 +421,9 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } + buildoptions_cpp { + "-std=c++0x", + } linkoptions { "-Wl,--gc-sections", "-static-libgcc", @@ -486,11 +488,13 @@ function toolchain(_buildDir, _libDir) configuration { "linux-*" } buildoptions { - "-std=c++0x", "-msse2", "-Wunused-value", "-Wundef", } + buildoptions_cpp { + "-std=c++0x", + } links { "rt", "dl", @@ -845,10 +849,12 @@ function toolchain(_buildDir, _libDir) "__STDC_VERSION__=199901L", } buildoptions { - "-std=c++0x", "-Wunused-value", "-Wundef", } + buildoptions_cpp { + "-std=c++0x", + } includedirs { "/opt/vc/include", "/opt/vc/include/interface/vcos/pthreads", |