Merge pull request #80789 from akien-mga/scons-ktx-requires-basis

SCons: Make ktx module require basis_universal
This commit is contained in:
Rémi Verschelde 2023-08-21 08:24:36 +02:00
commit 90e96e055f
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 6 additions and 8 deletions

View file

@ -11,6 +11,7 @@ thirdparty_obj = []
thirdparty_dir = "#thirdparty/libktx/"
thirdparty_sources = [
"lib/basis_transcode.cpp",
"lib/checkheader.c",
"lib/filestream.c",
"lib/hashlist.c",
@ -32,10 +33,7 @@ env_ktx.Prepend(CPPPATH=[thirdparty_dir + "include"])
env_ktx.Prepend(CPPPATH=[thirdparty_dir + "utils"])
env_ktx.Prepend(CPPPATH=[thirdparty_dir + "lib"])
env_ktx.Prepend(CPPPATH=[thirdparty_dir + "other_include"])
if env["module_basis_universal_enabled"]:
thirdparty_sources += [thirdparty_dir + "lib/basis_transcode.cpp"]
env_ktx.Prepend(CPPPATH=["#thirdparty/basis_universal"])
env_ktx.Prepend(CPPPATH=["#thirdparty/basis_universal"])
if env["vulkan"]:
env_ktx.Prepend(CPPPATH=["#thirdparty/vulkan/include"])

View file

@ -1,4 +1,5 @@
def can_build(env, platform):
env.module_add_dependencies("ktx", ["basis_universal"])
return True