From f73450f5418714ffdaf219ab43e159187e10adac Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sun, 1 Nov 2020 00:49:42 +0100
Subject: [PATCH 1/3] enable static runtime for all windows builds; fast
 floating point for x86/x64 builds; no sized dealloc for windows builds

---
 premake5.lua | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/premake5.lua b/premake5.lua
index b5b885b3..6bdb6f32 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -122,9 +122,11 @@ workspace "re3"
 	
 	filter { "platforms:*x86*" }
 		architecture "x86"
+		floatingpoint "Fast"
 		
 	filter { "platforms:*amd64*" }
 		architecture "amd64"
+		floatingpoint "Fast"
 
 	filter { "platforms:*arm*" }
 		architecture "ARM"
@@ -143,6 +145,7 @@ workspace "re3"
 		
 	filter "platforms:*librw_gl3_glfw*"
 		defines { "RW_GL3" }
+		staticruntime "Off"
 		includedirs { path.join(_OPTIONS["glewdir"], "include") }
 		if(not _OPTIONS["with-librw"]) then
 			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
@@ -184,6 +187,18 @@ project "librw"
 	files { path.join(Librw, "src/*.*") }
 	files { path.join(Librw, "src/*/*.*") }
 	
+	filter { "platforms:*x86*" }
+		architecture "x86"
+		floatingpoint "Fast"
+
+	filter { "platforms:*amd64*" }
+		architecture "amd64"
+		floatingpoint "Fast"
+
+	filter "platforms:win*"
+		staticruntime "on"
+		buildoptions { "/Zc:sizedDealloc-" }
+
 	filter "platforms:bsd*"
 		includedirs { "/usr/local/include" }
 		libdirs { "/usr/local/lib" }
@@ -194,6 +209,9 @@ project "librw"
 		includedirs {"/usr/local/include" }
 		libdirs { "/opt/local/lib" }
 		libdirs { "/usr/local/lib" }
+
+	filter "platforms:*librw_gl3_glfw*"
+		staticruntime "Off"
 	
 	filter "platforms:*RW33*"
 		flags { "ExcludeFromBuild" }
@@ -284,9 +302,11 @@ project "re3"
 	filter "platforms:win*"
 		files { addSrcFiles("src/skel/win") }
 		includedirs { "src/skel/win" }
+		buildoptions { "/Zc:sizedDealloc-" }
 		linkoptions "/SAFESEH:NO"
 		characterset ("MBCS")
 		targetextension ".exe"
+		staticruntime "on"
 		
 	filter "platforms:win*oal"
 		includedirs { "vendor/openal-soft/include" }
@@ -322,7 +342,6 @@ project "re3"
 	end
 
 	filter "platforms:*RW33*"
-		staticruntime "on"
 		includedirs { "sdk/rwsdk/include/d3d8" }
 		libdirs { "sdk/rwsdk/lib/d3d8/release" }
 		links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" }

From e9735f928f2c7c0675ef8ac2881da380f390576e Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sun, 1 Nov 2020 01:09:46 +0100
Subject: [PATCH 2/3] add ifdef LIBRW guard for pipelines and colourfilter

---
 src/core/config.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/config.h b/src/core/config.h
index 019ff659..7022fcc9 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -227,8 +227,10 @@ enum Config {
 #define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
 //#define USE_TEXTURE_POOL
 #define CUTSCENE_BORDERS_SWITCH
+#ifdef LIBRW
 //#define EXTENDED_COLOURFILTER		// more options for colour filter (replaces mblur)
 //#define EXTENDED_PIPELINES		// custom render pipelines (includes Neo)
+#endif
 #define MULTISAMPLING		// adds MSAA option
 
 #ifdef LIBRW

From db7c3bda7d13a01a3bee48b6a195a772d06e3c82 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Sun, 1 Nov 2020 01:17:14 +0100
Subject: [PATCH 3/3] disable static runtime for glfw

---
 premake5.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/premake5.lua b/premake5.lua
index 6bdb6f32..b8ab1491 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -145,7 +145,6 @@ workspace "re3"
 		
 	filter "platforms:*librw_gl3_glfw*"
 		defines { "RW_GL3" }
-		staticruntime "Off"
 		includedirs { path.join(_OPTIONS["glewdir"], "include") }
 		if(not _OPTIONS["with-librw"]) then
 			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
@@ -210,8 +209,8 @@ project "librw"
 		libdirs { "/opt/local/lib" }
 		libdirs { "/usr/local/lib" }
 
-	filter "platforms:*librw_gl3_glfw*"
-		staticruntime "Off"
+	filter "platforms:*gl3_glfw*"
+		staticruntime "off"
 	
 	filter "platforms:*RW33*"
 		flags { "ExcludeFromBuild" }
@@ -307,6 +306,9 @@ project "re3"
 		characterset ("MBCS")
 		targetextension ".exe"
 		staticruntime "on"
+
+	filter "platforms:win*glfw*"
+		staticruntime "off"
 		
 	filter "platforms:win*oal"
 		includedirs { "vendor/openal-soft/include" }