Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-23 04:33:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix thekla_atlas build

Browse Source 
clang doesn't like c++ versions being supplied to build c source files.
This commit is contained in:
Hein-Pieter van Braam 2017-12-08 16:18:36 +01:00
parent 372b79b0d3
commit a974464629
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"])
# upstream uses c++11
env_thekla_unwrap.Append(CCFLAGS="-std=gnu++11")
env_thekla_unwrap.Append(CXXFLAGS="-std=gnu++11")
if env["platform"] == 'x11':
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):
if not env['tools']:
env['module_thekla_unwrap_enabled'] = False
env['builtin_thekla_atlas'] = False
env.disabled_modules.append("thekla_unwrap")