godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 4e8bfe6989 969a35ae2b
commit 90e96e055f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ktx/SCsub
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"])

1
modules/ktx/config.py
View File

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

7
thirdparty/README.md vendored
View File

@ -310,12 +310,11 @@ Files extracted from upstream source:
- `LICENSE.md`
- `include/*`
- `lib/dfdutils/{LICENSES/Apache-2.0.txt,KHR,*.c,*.h,*.inl}`
- `lib/{basis_sgd.h,basis_transcode.cpp,checkheader.c,filestream.*,formatsize.h,gl_format.h,hashlist.c,ktxint.h,memstream.*,swap.c,texture*,uthash.h,vk_format.h,vkformat_enum.h`
- `lib/{basis_sgd.h,basis_transcode.cpp,checkheader.c,filestream.*,formatsize.h,gl_format.h,hashlist.c,ktxint.h,memstream.*,swap.c,texture*,uthash.h,vk_format.h,vkformat_enum.h}`
- `utils/unused.h`
- `other_include/KHR/*`
- ifndef-protect NOMINMAX define in `lib/gl_format.h` (see godot.patch)
- remove `basisu/` prefix from `thirdparty/libktx/lib/basis_transcode.cpp` basisu includes (see godot.patch)
- comment `VK_FORMAT_ASTC_*x*x*_UNORM_BLOCK_EXT` cases in `lib/dfdutils/vk2dfd.inl` (see godot.patch)
Some Godot-specific changes are applied via `godot.patch`.
## libogg