summaryrefslogtreecommitdiff
path: root/modules/basis_universal
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-02-13 15:53:32 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-02-14 10:02:31 +0100
commitd2537407efffde15372962ffca864b7400ade345 (patch)
tree4d99ff9f4814abc3e531a447794a62139ece1178 /modules/basis_universal
parent3679d49f4b709fd56e872633ead73008bc3e1c43 (diff)
Fix various GCC compilation warnings after Vulkan merge
Part of #36132.
Diffstat (limited to 'modules/basis_universal')
-rw-r--r--modules/basis_universal/SCsub6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/basis_universal/SCsub b/modules/basis_universal/SCsub
index 3e179762a5..d7342358d7 100644
--- a/modules/basis_universal/SCsub
+++ b/modules/basis_universal/SCsub
@@ -28,7 +28,11 @@ tool_sources = [
tool_sources = [thirdparty_dir + file for file in tool_sources]
transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"]
-env_basisu.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "transcoder"])
+# 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, '-isystem', Dir(thirdparty_dir + "transcoder").path])
+else:
+ env_basisu.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "transcoder"])
if env['target'] == "debug":
env_basisu.Append(CPPFLAGS=["-DBASISU_DEVEL_MESSAGES=1", "-DBASISD_ENABLE_DEBUG_FLAGS=1"])