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

Allow building cvtt with system squish

Browse Source 
It looks like the SCsub for cvtt was copied from squish and it left
the `if env['build_squish']:` line intact. This means that using
`scons builtin_squish=no modules/cvtt` would fail and overal builds
would also fail because they'd fail to find `ConvectionKernels.h`

(cherry picked from commit 0fbd00f656)
This commit is contained in:
Harley Laue 2019-09-23 02:53:29 -07:00 committed by Rémi Verschelde
parent 5f314c54ff
commit 6befb0836e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/cvtt/SCsub
View File

@ -6,19 +6,18 @@ Import('env_modules')
env_cvtt = env_modules.Clone() env_cvtt = env_modules.Clone()
# Thirdparty source files # Thirdparty source files
if env['builtin_squish']: thirdparty_dir = "#thirdparty/cvtt/"
thirdparty_dir = "#thirdparty/cvtt/" thirdparty_sources = [
thirdparty_sources = [ "ConvectionKernels.cpp"
"ConvectionKernels.cpp" ]
]
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env_cvtt.Append(CPPPATH=[thirdparty_dir]) env_cvtt.Append(CPPPATH=[thirdparty_dir])
env_thirdparty = env_cvtt.Clone() env_thirdparty = env_cvtt.Clone()
env_thirdparty.disable_warnings() env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
# Godot source files # Godot source files
env_cvtt.add_source_files(env.modules_sources, "*.cpp") env_cvtt.add_source_files(env.modules_sources, "*.cpp")