From f50026828ad3bfb656496b3321b8e6b5c71fc7b1 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Mon, 12 Jul 2021 04:13:42 +0200
Subject: Vanilla config for Windows and win-x86 only

---
 premake5.lua      | 9 +++++----
 src/core/config.h | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/premake5.lua b/premake5.lua
index 72ff4d09..82e985f7 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -68,7 +68,7 @@ end
 
 workspace "re3"
 	language "C++"
-	configurations { "Debug", "Release", "Vanilla" }
+	configurations { "Debug", "Release" }
 	startproject "re3"
 	location "build"
 	symbols "Full"
@@ -80,6 +80,7 @@ workspace "re3"
 	end
 
 	filter { "system:windows" }
+		configurations { "Vanilla" }
 		platforms {
 			"win-x86-RW33_d3d8-mss",
 			"win-x86-librw_d3d9-mss",
@@ -123,9 +124,6 @@ workspace "re3"
 			flags { "LinkTimeOptimization" }
 		end
 
-	filter "configurations:Vanilla"
-		defines { "VANILLA_DEFINES" }
-
 	filter { "platforms:win*" }
 		system "windows"
 
@@ -305,6 +303,9 @@ project "re3"
 	includedirs { "src/weapons" }
 	includedirs { "src/extras" }
 
+	filter "configurations:Vanilla"
+		defines { "VANILLA_DEFINES" }
+
 	if(not _OPTIONS["no-git-hash"]) then
 		defines { "USE_OUR_VERSIONING" }
 	end
diff --git a/src/core/config.h b/src/core/config.h
index 874a1405..885f98b8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -195,6 +195,10 @@ enum Config {
 #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
 
 #ifdef VANILLA_DEFINES
+#if !defined(_WIN32) || defined(__LP64__) || defined(_WIN64)
+#error Vanilla can only be built for win-x86
+#endif
+
 #define FINAL
 #define MASTER
 //#define USE_MY_DOCUMENTS
-- 
cgit v1.2.3