summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-04-11 09:01:15 +0200
committerGitHub <noreply@github.com>2019-04-11 09:01:15 +0200
commitf705fc5a989534e7b3f34a2c8f4a7f0f5912b6ad (patch)
treee95b8b8ca2f034f87bf95ba9a6e43566f5c94f8f /modules
parent0e7f116b5236d248b8e0088705f3d83d8c845b45 (diff)
parent6c90aaf5c741fd7d9ff7b47e5bb4ed7d45623c2e (diff)
Merge pull request #27916 from WindyDarian/vhacd_namespace_placing
Fixes for vhacd module
Diffstat (limited to 'modules')
-rw-r--r--modules/vhacd/SCsub4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/vhacd/SCsub b/modules/vhacd/SCsub
index e89a64a68e..11cd5f4743 100644
--- a/modules/vhacd/SCsub
+++ b/modules/vhacd/SCsub
@@ -27,6 +27,10 @@ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env_vhacd.Append(CPPPATH=[thirdparty_dir+"/inc"])
env_vhacd.Append(CPPFLAGS=["-DGODOT_ENET"])
+# upstream uses c++11
+if not env.msvc:
+ env_vhacd.Append(CCFLAGS="-std=c++11")
+
env_thirdparty = env_vhacd.Clone()
env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)