Fixed a couple more Windows issues

noodlecollie · Apr 20, 2023 · e15c8ea · e15c8ea
1 parent 41f6f8a
commit e15c8ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/xash3d_engine/filesystem/VFileSystem009.cpp b/xash3d_engine/filesystem/VFileSystem009.cpp
@@ -23,8 +23,6 @@ GNU General Public License for more details.
 #include "VFileSystem009.h"
 #include "common/com_strings.h"
 
-#include "alloca.h"
-
 #if __cplusplus < 201103L
 #define override
 #define nullptr NULL

diff --git a/xash3d_engine/thirdparty/opus/CMakeLists.txt b/xash3d_engine/thirdparty/opus/CMakeLists.txt
@@ -6,7 +6,17 @@ set(OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF CACHE BOOL "" FORCE)
 # A slow speed warning message is printed if Opus is compiled without optimisations.
 # We never want this, so just force -O3 here for GCC.
 if(NOT MSVC)
-add_compile_options("-O3")
+	add_compile_options("-O3")
+endif()
+
+# On MSVC there is some warning spam about "macro expansion producing 'defined' has undefined behavior".
+# I'm not sure where this comes from and haven't been able to work it out.
+# It seems to be produced by the use of the _CRT_INTERNAL_NONSTDC_NAMES macro.
+# The closest issue I've been able to find in the wild is https://stackoverflow.com/q/65402366
+# which seems to imply that CMake may be at fault, but I don't know how or why.
+# For now, we just disable this warning for Opus.
+if(MSVC)
+	add_compile_options("/wd5105")
 endif()
 
 set(OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})