Merge remote-tracking branch 'origin/miami' into lcs

premake5.lua

@@ -68,7 +68,7 @@ end
 
 workspace "reLCS"
 	language "C++"
-	configurations { "Debug", "Release", "Vanilla" }
+	configurations { "Debug", "Release" }
 	startproject "reLCS"
 	location "build"
 	symbols "Full"
@@ -86,7 +86,8 @@ workspace "reLCS"
 		linkoptions { "-fsanitize=address" }
 	end
 
-	filter { "system:windows" }
+	filter { "system:windows" }
+		configurations { "Vanilla" }
 		platforms {
 			"win-x86-RW34_d3d8-mss",
 			"win-x86-librw_d3d9-mss",
@@ -130,9 +131,6 @@ workspace "reLCS"
 			flags { "LinkTimeOptimization" }
 		end
 
-	filter "configurations:Vanilla"
-		defines { "VANILLA_DEFINES" }
-
 	filter { "platforms:win*" }
 		system "windows"
 
@@ -324,7 +322,10 @@ project "reLCS"
 		includedirs { "vendor/ogg/include" }
 		includedirs { "vendor/opus/include" }
 		includedirs { "vendor/opusfile/include" }
-	end
+	end
+
+	filter "configurations:Vanilla"
+		defines { "VANILLA_DEFINES" }
 
 	filter "platforms:*mss"
 		defines { "AUDIO_MSS" }