Hopefully fix msvc build.

Relintai · Jul 15, 2024 · 3cab5b1 · 3cab5b1
1 parent 9d6680c
commit 3cab5b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/editor_modules/denoise/SCsub b/editor_modules/denoise/SCsub
@@ -124,7 +124,13 @@ env.modules_sources += thirdparty_obj
 if env["platform"] == "windows" and not env.msvc:
     env_thirdparty.Append(CPPFLAGS=["-mstackrealign"])
 
-env_thirdparty.Append(CPPFLAGS=["-frtti"])
+
+if not env.msvc:
+    env_thirdparty["CXXFLAGS"].remove("-fno-rtti")
+    env_thirdparty.Append(CXXFLAGS=["-frtti"])
+else:
+    env_thirdparty["CXXFLAGS"].remove("/GR-")
+    env_thirdparty.Append(CXXFLAGS=["/GR"])
 
 weights_in_path = thirdparty_dir + "weights/rtlightmap_hdr.tza"
 weights_out_path = thirdparty_dir + "weights/rtlightmap_hdr.gen.cpp"

diff --git a/editor_modules/raycast/SCsub b/editor_modules/raycast/SCsub
@@ -103,9 +103,16 @@ if env["builtin_embree"]:
                 "-fno-tree-vectorize",
                 "-fvisibility=hidden",
                 "-fvisibility-inlines-hidden",
-                "-frtti" # embree needs it
             ]
         )
+
+
+    if not env.msvc:
+        env_thirdparty["CXXFLAGS"].remove("-fno-rtti")
+        env_thirdparty.Append(CXXFLAGS=["-frtti"])
+    else:
+        env_thirdparty["CXXFLAGS"].remove("/GR-")
+        env_thirdparty.Append(CXXFLAGS=["/GR"])
 
     env.modules_sources += thirdparty_obj