From e62448638a9e336cb5e7763829398b96c5cdaeff Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Thu, 1 Sep 2016 11:55:53 +0100 Subject: [PATCH] Be more specific when applying C++ language build options. --- build/Helpers.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/Helpers.lua b/build/Helpers.lua index 0219e13a..6cc37093 100644 --- a/build/Helpers.lua +++ b/build/Helpers.lua @@ -20,7 +20,6 @@ libdir = path.join(builddir, "lib", "%{cfg.buildcfg}_%{cfg.platform}"); gendir = path.join(builddir, "gen"); msvc_buildflags = { "/wd4267" } -gcc_buildflags = { "-std=c++11 -fpermissive" } msvc_cpp_defines = { } @@ -50,10 +49,13 @@ function SetupNativeProject() configuration { "gmake" } buildoptions { gcc_buildflags } - - configuration { "macosx" } + + filter { "system:macosx", "language:C++" } buildoptions { gcc_buildflags, "-stdlib=libc++" } links { "c++" } + + filter { "system:not windows", "language:C++" } + buildoptions { "-fpermissive -std=c++11" } -- OS-specific options