diff --git a/CMakeLists.txt b/CMakeLists.txt
index d046e7bf7..5e35cc685 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ cmake_dependent_option(
 	OFF
 )
 option(SRB2_CONFIG_ENABLE_DISCORDRPC "Enable Discord RPC features" ON)
+option(SRB2_CONFIG_STATIC_STDLIB "Link static version of standard library. All dependencies must also be static" ON)
 option(SRB2_CONFIG_HWRENDER "Enable hardware render (OpenGL) support" ON)
 option(SRB2_CONFIG_STATIC_OPENGL "Enable static linking GL (do not do this)" OFF)
 option(SRB2_CONFIG_ERRORMODE "Compile C code with warnings treated as errors." OFF)
diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt
index 8bc6a5423..e49596525 100644
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -15,12 +15,8 @@ target_sources(SRB2SDL2 PRIVATE
 
 if("${CMAKE_SYSTEM_NAME}" MATCHES Windows)
 	target_sources(SRB2SDL2 PRIVATE
-		../win32/win_dbg.c)
-
-	if("${CMAKE_C_COMPILER_ID}" MATCHES clang)
-		target_sources(SRB2SDL2 PRIVATE
-			../win32/Srb2win.rc)
-	endif()
+		../win32/win_dbg.c
+		../win32/Srb2win.rc)
 endif()
 
 if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin)
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index c4139f774..b9a2e51d7 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -45,7 +45,7 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}")
 			"SDL2MIXER_MP3 ON"
 			"SDL2MIXER_MP3_DRMP3 ON"
 			"SDL2MIXER_MIDI ON"
-			"SDL2MIXER_OPUS OFF"
+			"SDL2MIXER_OPUS ON"
 			"SDL2MIXER_VORBIS STB"
 			"SDL2MIXER_WAVE ON"
 	)