diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-23 13:13:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 13:13:11 +0200 |
| commit | 013e88fe4bd82766e78881f71ded503a46bfb34e (patch) | |
| tree | ee65f6cecec7c80713a5e4618cd016a6005fb59a | |
| parent | 46f909f8af092cf1aa9f708a174af6c57b32430d (diff) | |
| parent | 0fbd00f6569eb818542dfefd935a2f7f25f13829 (diff) | |
Merge pull request #32271 from losinggeneration/build_cvtt_with_system_squish
Allow building cvtt with system squish
| -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") |