diff options
| author | aap <aap@papnet.eu> | 2020-11-05 10:59:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 10:59:02 +0100 |
| commit | 881a3e1091fa1fcf6d8e52e358a614bff32f0201 (patch) | |
| tree | f0bb238c2cfc8f40d0787924eb052d7b68e446af | |
| parent | only do backface culling on buildings (diff) | |
| parent | disable static runtime for glfw (diff) | |
| download | re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.tar re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.tar.gz re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.tar.bz2 re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.tar.lz re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.tar.xz re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.tar.zst re3-881a3e1091fa1fcf6d8e52e358a614bff32f0201.zip | |
| -rw-r--r-- | premake5.lua | 23 | ||||
| -rw-r--r-- | src/core/config.h | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/premake5.lua b/premake5.lua index b5b885b3..b8ab1491 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"
@@ -184,6 +186,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 +208,9 @@ project "librw" includedirs {"/usr/local/include" }
libdirs { "/opt/local/lib" }
libdirs { "/usr/local/lib" }
+
+ filter "platforms:*gl3_glfw*"
+ staticruntime "off"
filter "platforms:*RW33*"
flags { "ExcludeFromBuild" }
@@ -284,9 +301,14 @@ 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*glfw*"
+ staticruntime "off"
filter "platforms:win*oal"
includedirs { "vendor/openal-soft/include" }
@@ -322,7 +344,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" }
diff --git a/src/core/config.h b/src/core/config.h index ea4330a4..9af75405 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -230,8 +230,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 |