mirror of
https://github.com/godotengine/godot
synced 2024-09-05 05:08:27 +00:00
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`
This commit is contained in:
parent
fb12f54721
commit
0fbd00f656
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue