From 6befb0836e0deb39475da82c6fd05e2c897b1646 Mon Sep 17 00:00:00 2001 From: Harley Laue Date: Mon, 23 Sep 2019 02:53:29 -0700 Subject: [PATCH] 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` (cherry picked from commit 0fbd00f6569eb818542dfefd935a2f7f25f13829) --- modules/cvtt/SCsub | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/cvtt/SCsub b/modules/cvtt/SCsub index fcc69d8371..8c93a594b5 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.Append(CPPPATH=[thirdparty_dir]) +env_cvtt.Append(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")