Skip to content

tweak(build): update premake to 5.0.0-beta8 #3805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NarutoUA wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tweak(build): update premake to 5.0.0-beta8 #3805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/client/launcher/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/components/citizen-scripting-lua/component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion code/components/citizen-server-impl/component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion code/components/http-client/component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependency 'rage-device'

flags { 'NoRuntimeChecks' }
runtimechecks "Off"

return function()
filter {}
Expand Down
2 changes: 1 addition & 1 deletion code/components/net-http-server/component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ return function()
filter {}

if os.istarget('windows') then
flags { "LinkTimeOptimization" }
linktimeoptimization "On"
end
end
2 changes: 1 addition & 1 deletion code/components/net-packet/component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ return function()
filter {}

if os.istarget('windows') then
flags { "LinkTimeOptimization" }
linktimeoptimization "On"
end
end

2 changes: 1 addition & 1 deletion code/components/net-tcp-server/component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ return function()
filter {}

if os.istarget('windows') then
flags { "LinkTimeOptimization" }
linktimeoptimization "On"
end
end
9 changes: 6 additions & 3 deletions code/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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/"

Expand Down
3 changes: 2 additions & 1 deletion code/server/launcher/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion code/tests/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
Expand Down
Binary file modified code/tools/ci/premake5.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion code/vendor/curl-crt.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ return {

language "C"

flags "NoRuntimeChecks"
runtimechecks "Off"

if (not a) or static then
if not a then
Expand Down
2 changes: 1 addition & 1 deletion code/vendor/lua.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion code/vendor/minizip.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ return {

defines { "HAVE_ZLIB" }

flags "NoRuntimeChecks"
runtimechecks "Off"

if a then
staticruntime 'On'
Expand Down
2 changes: 1 addition & 1 deletion code/vendor/nghttp2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ return {
staticruntime 'On'
end

flags "NoRuntimeChecks"
runtimechecks "Off"

files_project '../vendor/nghttp2/lib/'
{
Expand Down
2 changes: 1 addition & 1 deletion code/vendor/rpmalloc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ return {
kind "StaticLib"

if os.istarget('windows') then
flags { "LinkTimeOptimization" }
linktimeoptimization "On"

defines {
"ENABLE_THREAD_CACHE=1",
Expand Down
2 changes: 1 addition & 1 deletion code/vendor/uws.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ return {

defines { "UWS_THREADSAFE", "LIBUS_NO_SSL" }

flags "NoRuntimeChecks"
runtimechecks "Off"

files_project '../vendor/uws/src/'
{
Expand Down