diff --git a/code/client/launcher/premake5.lua b/code/client/launcher/premake5.lua index d8b37a0899..426a1c5058 100644 --- a/code/client/launcher/premake5.lua +++ b/code/client/launcher/premake5.lua @@ -123,7 +123,8 @@ local function launcherpersonality_inner(name) defines "LAUNCHER_PERSONALITY_ANY_GAME" end - flags { "NoManifest", "NoImportLib" } + manifest "Off" + useimportlib "Off" symbols "Full" buildoptions "/MP" diff --git a/code/components/citizen-scripting-lua/component.lua b/code/components/citizen-scripting-lua/component.lua index 4b648732f5..30d9b7b2e2 100644 --- a/code/components/citizen-scripting-lua/component.lua +++ b/code/components/citizen-scripting-lua/component.lua @@ -12,7 +12,7 @@ defines { } if os.istarget('windows') and not _OPTIONS['with-asan'] then - flags { "LinkTimeOptimization" } + linktimeoptimization "On" buildoptions '/Zc:threadSafeInit- /EHa /fp:fast' end \ No newline at end of file diff --git a/code/components/citizen-server-impl/component.lua b/code/components/citizen-server-impl/component.lua index a357ada061..3141f2d85a 100644 --- a/code/components/citizen-server-impl/component.lua +++ b/code/components/citizen-server-impl/component.lua @@ -3,7 +3,7 @@ defines { "_ENABLE_EXTENDED_ALIGNED_STORAGE" } if os.istarget('windows') then filter { "configurations:Release" } - flags { "LinkTimeOptimization" } + linktimeoptimization "On" filter {} buildoptions '/fp:fast' diff --git a/code/components/http-client/component.lua b/code/components/http-client/component.lua index 767c778722..09b0f4c58d 100644 --- a/code/components/http-client/component.lua +++ b/code/components/http-client/component.lua @@ -1,6 +1,6 @@ dependency 'rage-device' -flags { 'NoRuntimeChecks' } +runtimechecks "Off" return function() filter {} diff --git a/code/components/net-http-server/component.lua b/code/components/net-http-server/component.lua index 253f6c39fe..8e2e1ef36b 100644 --- a/code/components/net-http-server/component.lua +++ b/code/components/net-http-server/component.lua @@ -2,6 +2,6 @@ return function() filter {} if os.istarget('windows') then - flags { "LinkTimeOptimization" } + linktimeoptimization "On" end end diff --git a/code/components/net-packet/component.lua b/code/components/net-packet/component.lua index 221dad7b39..a9a0d240cf 100644 --- a/code/components/net-packet/component.lua +++ b/code/components/net-packet/component.lua @@ -2,7 +2,7 @@ return function() filter {} if os.istarget('windows') then - flags { "LinkTimeOptimization" } + linktimeoptimization "On" end end diff --git a/code/components/net-tcp-server/component.lua b/code/components/net-tcp-server/component.lua index 253f6c39fe..8e2e1ef36b 100644 --- a/code/components/net-tcp-server/component.lua +++ b/code/components/net-tcp-server/component.lua @@ -2,6 +2,6 @@ return function() filter {} if os.istarget('windows') then - flags { "LinkTimeOptimization" } + linktimeoptimization "On" end end diff --git a/code/premake5.lua b/code/premake5.lua index 14c9cc9142..aef176d11b 100644 --- a/code/premake5.lua +++ b/code/premake5.lua @@ -64,9 +64,11 @@ workspace "CitizenMP" symbols "Full" characterset "Unicode" - flags { "No64BitChecks" } + enable64bitchecks "Off" - flags { "NoIncrementalLink", "NoMinimalRebuild" } -- this breaks our custom section ordering in citilaunch, and is kind of annoying otherwise + -- this breaks our custom section ordering in citilaunch, and is kind of annoying otherwise + incrementallink "Off" + minimalrebuild "Off" editandcontinue 'Off' justmycode 'Off' @@ -729,7 +731,8 @@ if _OPTIONS['game'] ~= 'server' then defines { "USING_CEF_SHARED", "NOMINMAX", "WIN32", "WRAPPING_CEF_SHARED", "DCHECK_ALWAYS_ON" } - flags { "NoIncrementalLink", "NoMinimalRebuild" } + incrementallink "Off" + minimalrebuild "Off" local cefRoot = "../vendor/cef/" diff --git a/code/server/launcher/premake5.lua b/code/server/launcher/premake5.lua index f13a51dca8..8326a2d9da 100644 --- a/code/server/launcher/premake5.lua +++ b/code/server/launcher/premake5.lua @@ -8,7 +8,8 @@ if os.istarget('windows') then links { "psapi", "wininet", "winhttp" } - flags { "NoManifest", "NoImportLib" } + manifest "Off" + useimportlib "Off" files { "server.rc" } -- match the 4 MB stack size set on Linux in Main.cpp diff --git a/code/tests/premake5.lua b/code/tests/premake5.lua index e359b75472..08eeaf328c 100644 --- a/code/tests/premake5.lua +++ b/code/tests/premake5.lua @@ -10,7 +10,8 @@ if os.istarget('windows') then links { "psapi", "wininet", "winhttp" } - flags { "NoManifest", "NoImportLib" } + manifest "Off" + useimportlib "Off" add_dependencies { 'vendor:rpmalloc' } else links { 'dl', 'pthread' } diff --git a/code/tools/ci/premake5.exe b/code/tools/ci/premake5.exe index c73da1fb0f..32f354f95b 100644 Binary files a/code/tools/ci/premake5.exe and b/code/tools/ci/premake5.exe differ diff --git a/code/vendor/curl-crt.lua b/code/vendor/curl-crt.lua index e2aee9e8a0..19b8659f33 100644 --- a/code/vendor/curl-crt.lua +++ b/code/vendor/curl-crt.lua @@ -36,7 +36,7 @@ return { language "C" - flags "NoRuntimeChecks" + runtimechecks "Off" if (not a) or static then if not a then diff --git a/code/vendor/lua.lua b/code/vendor/lua.lua index 66b4c52aaa..de819e2a89 100644 --- a/code/vendor/lua.lua +++ b/code/vendor/lua.lua @@ -19,7 +19,7 @@ return { vectorextensions "SSE2" -- @EXPERIMENT if os.istarget('windows') then - flags { "LinkTimeOptimization" } + linktimeoptimization "On" -- longjmp *should* be exception-safe on Windows non-x86 defines { "LUA_USE_LONGJMP" } diff --git a/code/vendor/minizip.lua b/code/vendor/minizip.lua index 831b648062..9fb0e87751 100644 --- a/code/vendor/minizip.lua +++ b/code/vendor/minizip.lua @@ -17,7 +17,7 @@ return { defines { "HAVE_ZLIB" } - flags "NoRuntimeChecks" + runtimechecks "Off" if a then staticruntime 'On' diff --git a/code/vendor/nghttp2.lua b/code/vendor/nghttp2.lua index 9b1c293181..cd8190e274 100644 --- a/code/vendor/nghttp2.lua +++ b/code/vendor/nghttp2.lua @@ -26,7 +26,7 @@ return { staticruntime 'On' end - flags "NoRuntimeChecks" + runtimechecks "Off" files_project '../vendor/nghttp2/lib/' { diff --git a/code/vendor/rpmalloc.lua b/code/vendor/rpmalloc.lua index 911af6177e..a2a94ce783 100644 --- a/code/vendor/rpmalloc.lua +++ b/code/vendor/rpmalloc.lua @@ -9,7 +9,7 @@ return { kind "StaticLib" if os.istarget('windows') then - flags { "LinkTimeOptimization" } + linktimeoptimization "On" defines { "ENABLE_THREAD_CACHE=1", diff --git a/code/vendor/uws.lua b/code/vendor/uws.lua index 06d47b256b..7084cb3496 100644 --- a/code/vendor/uws.lua +++ b/code/vendor/uws.lua @@ -14,7 +14,7 @@ return { defines { "UWS_THREADSAFE", "LIBUS_NO_SSL" } - flags "NoRuntimeChecks" + runtimechecks "Off" files_project '../vendor/uws/src/' {