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

Merge pull request #14412 from hpvb/fix-thekla-atlas-build

Browse source 
Fix thekla_atlas build
This commit is contained in:
Juan Linietsky 2017-12-08 12:22:02 -03:00 committed by GitHub
commit 146bdf031d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/thekla_unwrap/SCsub
View file

@ -55,7 +55,7 @@ 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(CCFLAGS="-std=gnu++11") env_thekla_unwrap.Append(CXXFLAGS="-std=gnu++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"])

2
modules/thekla_unwrap/config.py
View file

@ -3,5 +3,5 @@ def can_build(platform):
def configure(env): def configure(env):
if not env['tools']: if not env['tools']:
env['module_thekla_unwrap_enabled'] = False env['builtin_thekla_atlas'] = False
env.disabled_modules.append("thekla_unwrap") env.disabled_modules.append("thekla_unwrap")