diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-18 18:48:14 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-18 18:55:40 +0100 |
| commit | 48ed0474e2bc6e165e8dd30740d21536e6d0e40c (patch) | |
| tree | 4e3dd06c8c50f0bbe76c1d693487012436d1b945 /modules/basis_universal/SCsub | |
| parent | 5f05e2b9b1a3fedcdd7ecb2ab976a2687fd6f19a (diff) | |
| download | redot-engine-48ed0474e2bc6e165e8dd30740d21536e6d0e40c.tar.gz | |
basis_universal: Unbundle jpgd, use our newer copy
Diffstat (limited to 'modules/basis_universal/SCsub')
| -rw-r--r-- | modules/basis_universal/SCsub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/basis_universal/SCsub b/modules/basis_universal/SCsub index 14669847bc..80bfd7e858 100644 --- a/modules/basis_universal/SCsub +++ b/modules/basis_universal/SCsub @@ -28,7 +28,6 @@ encoder_sources = [ "basisu_resample_filters.cpp", "basisu_ssim.cpp", "basisu_uastc_enc.cpp", - "jpgd.cpp", "pvpngreader.cpp", ] encoder_sources = [thirdparty_dir + "encoder/" + file for file in encoder_sources] @@ -36,9 +35,11 @@ transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"] # Treat Basis headers as system headers to avoid raising warnings. Not supported on MSVC. if not env.msvc: - env_basisu.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path]) + env_basisu.Append( + CPPFLAGS=["-isystem", Dir(thirdparty_dir).path, "-isystem", Dir("#thirdparty/jpeg-compressor").path] + ) else: - env_basisu.Prepend(CPPPATH=[thirdparty_dir]) + env_basisu.Prepend(CPPPATH=[thirdparty_dir, "#thirdparty/jpeg-compressor"]) if env["builtin_zstd"]: env_basisu.Prepend(CPPPATH=["#thirdparty/zstd"]) |