summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-05 10:59:02 +0100
committerSergeanur <s.anureev@yandex.ua>2020-11-05 15:38:02 +0100
commit0d55b6182af41cf555ed026c7d0ffb5ebb18e431 (patch)
tree1c47586d2a9653683d9536ef9c3f83c765169b88
parentfixes (diff)
downloadre3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.tar
re3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.tar.gz
re3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.tar.bz2
re3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.tar.lz
re3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.tar.xz
re3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.tar.zst
re3-0d55b6182af41cf555ed026c7d0ffb5ebb18e431.zip
-rw-r--r--premake5.lua23
-rw-r--r--src/core/config.h2
2 files changed, 24 insertions, 1 deletions
diff --git a/premake5.lua b/premake5.lua
index 8300dd9a..7398eef0 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -122,9 +122,11 @@ workspace "reVC"
filter { "platforms:*x86*" }
architecture "x86"
+ floatingpoint "Fast"
filter { "platforms:*amd64*" }
architecture "amd64"
+ floatingpoint "Fast"
filter { "platforms:*arm*" }
architecture "ARM"
@@ -185,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" }
@@ -195,6 +209,9 @@ project "librw"
includedirs {"/usr/local/include" }
libdirs { "/opt/local/lib" }
libdirs { "/usr/local/lib" }
+
+ filter "platforms:*gl3_glfw*"
+ staticruntime "off"
filter "platforms:*RW34*"
flags { "ExcludeFromBuild" }
@@ -286,9 +303,14 @@ project "reVC"
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*glfw*"
+ staticruntime "off"
filter "platforms:win*oal"
includedirs { "vendor/openal-soft/include" }
@@ -324,7 +346,6 @@ project "reVC"
end
filter "platforms:*RW34*"
- staticruntime "on"
includedirs { "sdk/rwsdk/include/d3d8" }
libdirs { "sdk/rwsdk/lib/d3d8/release" }
links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtanim", "rtcharse", "rpanisot" }
diff --git a/src/core/config.h b/src/core/config.h
index ce77391c..6e0a17f7 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -243,8 +243,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 TODO
#ifdef LIBRW