diff options
| author | Harley Laue <losinggeneration@gmail.com> | 2019-09-23 02:53:29 -0700 |
|---|---|---|
| committer | Harley Laue <losinggeneration@gmail.com> | 2019-09-23 02:59:59 -0700 |
| commit | 0fbd00f6569eb818542dfefd935a2f7f25f13829 (patch) | |
| tree | 73fe9cce41cd064571f05b33f7ab5a507b9837c4 /modules | |
| parent | fb12f54721ad4b6ab3755624ea912de3af8c12b3 (diff) | |
Allow building cvtt with system squish
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`
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/cvtt/SCsub | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/cvtt/SCsub b/modules/cvtt/SCsub index 142af0c800..746b23ca28 100644 --- a/modules/cvtt/SCsub +++ b/modules/cvtt/SCsub @@ -6,19 +6,18 @@ Import('env_modules') env_cvtt = env_modules.Clone() # Thirdparty source files -if env['builtin_squish']: - thirdparty_dir = "#thirdparty/cvtt/" - thirdparty_sources = [ - "ConvectionKernels.cpp" - ] +thirdparty_dir = "#thirdparty/cvtt/" +thirdparty_sources = [ + "ConvectionKernels.cpp" +] - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] +thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env_cvtt.Prepend(CPPPATH=[thirdparty_dir]) +env_cvtt.Prepend(CPPPATH=[thirdparty_dir]) - env_thirdparty = env_cvtt.Clone() - env_thirdparty.disable_warnings() - env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) +env_thirdparty = env_cvtt.Clone() +env_thirdparty.disable_warnings() +env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) # Godot source files env_cvtt.add_source_files(env.modules_sources, "*.cpp") |