godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14587 from hoelzl/pr-no-std-arg-on-msvc

Browse Source 
Don't pass -std=gnu++11 to MSVC
This commit is contained in:
Rémi Verschelde 2017-12-13 08:37:33 +01:00 committed by GitHub
commit 88a3e15981
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/etc/SCsub
View File

@ -34,7 +34,8 @@ env_etc.Append(CPPPATH=[thirdparty_dir])
env_etc.add_source_files(env.modules_sources, "*.cpp")
# upstream uses c++11
env_etc.Append(CCFLAGS="-std=gnu++11")
if (not env_etc.msvc):
env_etc.Append(CCFLAGS="-std=c++11")
# -ffast-math seems to be incompatible with ec2comp on recent versions of
# GCC and Clang
if '-ffast-math' in env_etc['CCFLAGS']:

3
modules/thekla_unwrap/SCsub
View File

@ -56,7 +56,8 @@ if env['builtin_thekla_atlas']:
env_thekla_unwrap.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/poshlib", thirdparty_dir + "/nvcore", thirdparty_dir + "/nvmesh"])
# upstream uses c++11
env_thekla_unwrap.Append(CXXFLAGS="-std=gnu++11")
if (not env_thekla_unwrap.msvc):
env_thekla_unwrap.Append(CXXFLAGS="-std=c++11")
if env["platform"] == 'x11':
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX", "-DPOSH_COMPILER_GCC"])