diff options
author | Tobias Markmann <tm@ayena.de> | 2016-03-14 11:27:29 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2016-03-14 16:00:29 (GMT) |
commit | 8cdebcff1d1e8321b070c7e675f9a9709a2b0b81 (patch) | |
tree | 2be3bc1fb4636f208e4a872c213b8e18fa1bb45f /Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript | |
parent | fcb5204aeacd6c4bf49223f133df285f22f7cd4b (diff) | |
download | swift-8cdebcff1d1e8321b070c7e675f9a9709a2b0b81.zip swift-8cdebcff1d1e8321b070c7e675f9a9709a2b0b81.tar.bz2 |
Build all Swift projects as C++11
Added a SCons compiler test so that the build process fails
early if C++11 is not supported.
Remove C++11 checks as we now default to C++11 and they are
not needed anymore.
Ignore a Clang warning if building 3rdParty Boost.
Test-Information:
Tested build and unit tests on OS X 10.11.3.
Change-Id: Icbecbd1e25e8d8bbe5f402f75355373a86b5f8a1
Diffstat (limited to 'Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript')
-rw-r--r-- | Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript index 5d27b70..f3cb0d7 100644 --- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript +++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript @@ -13,24 +13,5 @@ example_env.UseFlags(example_env["SWIFTEN_DEP_FLAGS"]) for i in range(1,7) : example_env.Program("EchoBot" + str(i), ["EchoBot" + str(i) + ".cpp"]) +example_env.Program("EchoBot0x", "EchoBot0x.cpp") example_env.Program("EchoComponent", "EchoComponent.cpp") - -# C++0x -cpp0x = False -cpp0x_env = example_env.Clone() -if env["PLATFORM"] == "win32" : - if int(env["MSVS_VERSION"].split(".")[0]) >= 10 : - cpp0x = True -elif env["PLATFORM"] == "hpux" : - pass -elif env["PLATFORM"] == "sunos" : - pass -else : - if env["CCVERSION"].split(".") >= ["4", "5", "0"] : - # Temporarily disabling c++0x mode because of problems with boost::thread - # on some platforms - #cpp0x = True - cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"]) - cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"]) -if cpp0x : - cpp0x_env.Program("EchoBot0x", "EchoBot0x.cpp") |