diff options
| author | aap <aap@papnet.eu> | 2020-11-05 10:59:02 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-11-05 16:38:02 +0200 |
| commit | 0d55b6182af41cf555ed026c7d0ffb5ebb18e431 (patch) | |
| tree | 1c47586d2a9653683d9536ef9c3f83c765169b88 /premake5.lua | |
| parent | e473123a6aa3769b7aeef54526561c2f1ab32cc1 (diff) | |
Merge pull request #795 from withmorten/master
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
# Conflicts:
# premake5.lua
# src/core/config.h
Diffstat (limited to 'premake5.lua')
| -rw-r--r-- | premake5.lua | 23 |
1 files changed, 22 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" } |