asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change -std=gnu++11 to -stc=c++11 and don't pass flag to MSVC

Browse source
This commit is contained in:
Matthias Hoelzl 2017-12-12 11:16:23 +01:00
parent 56a44ca03e
commit 26a1621678
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") env_etc.add_source_files(env.modules_sources, "*.cpp")
# upstream uses c++11 # 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 # -ffast-math seems to be incompatible with ec2comp on recent versions of
# GCC and Clang # GCC and Clang
if '-ffast-math' in env_etc['CCFLAGS']: 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"]) env_thekla_unwrap.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/poshlib", thirdparty_dir + "/nvcore", thirdparty_dir + "/nvmesh"])
# upstream uses c++11 # 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': if env["platform"] == 'x11':
env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX"]) env_thekla_unwrap.Append(CCFLAGS=["-DNV_OS_LINUX"])