Skip to content

Commit 9be3568

Browse files
committed
Fix deprecated premake warnings
1 parent 4e657bd commit 9be3568

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

Client/ceflauncher/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project "CEFLauncher"
77
includedirs { "../sdk" }
88

99
links { "CEFLauncher DLL"}
10-
flags { "WinMain" }
10+
entrypoint "WinMainCRTStartup"
1111

1212
vpaths {
1313
["Headers/*"] = "**.h",

Client/launch/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project "Client Launcher"
99
pchheader "StdInc.h"
1010
pchsource "StdInc.cpp"
1111

12-
flags { "WinMain" }
12+
entrypoint "WinMainCRTStartup"
1313

1414
vpaths {
1515
["Headers/*"] = "**.h",

premake5.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ workspace "MTASA"
2121
location "Build"
2222
startproject "Client Launcher"
2323

24-
flags { "C++11" }
24+
cppdialect "C++11"
2525
characterset "MBCS"
2626
pic "On"
2727
symbols "On"
@@ -95,7 +95,7 @@ workspace "MTASA"
9595
vectorextensions "SSE2"
9696

9797
-- Only build the client on Windows
98-
if os.get() == "windows" then
98+
if os.target() == "windows" then
9999
group "Client"
100100
include "Client/ceflauncher"
101101
include "Client/ceflauncher_DLL"

utils/buildactions/compose_files.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ premake.modules.compose_files = {}
66
local BIN_DIR = "Bin"
77
local DATA_DIR = "Shared/data/MTA San Andreas"
88
local OUTPUT_DIR = "InstallFiles"
9-
local WINDOWS = os.get() == "windows"
9+
local WINDOWS = os.host() == "windows"
1010

1111
newaction {
1212
trigger = "compose_files",

utils/buildactions/install_cef.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ newaction {
1313

1414
execute = function()
1515
-- Only execute on Windows
16-
if os.get() ~= "windows" then return end
16+
if os.host() ~= "windows" then return end
1717

1818
-- Download md5
1919
local correct_checksum, result_string = http.get(CEF_URL_MD5)

utils/buildactions/install_data.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ newaction {
2222
os.mkdir(BIN_DIR)
2323

2424
-- Copy data files
25-
if os.get() == "windows" then
25+
if os.host() == "windows" then
2626
os.copydir(DATA_DIR, BIN_DIR)
2727
end
2828

utils/buildactions/install_resources.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ local unzip = function(zip_path, target_path)
44
zip_path = path.translate(zip_path)
55
target_path = path.translate(target_path)
66

7-
if os.get() == "windows" then
7+
if os.host() == "windows" then
88
os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" -aoa -o\"%s\"", zip_path, target_path)
99
else
1010
-- Linux: TODO

utils/buildactions/utils.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function os.expanddir_wildcard(from, to)
8484
end
8585

8686
function os.md5_file(path)
87-
if os.get() == "windows" then
87+
if os.host() == "windows" then
8888
local s = os.outputof(string.format("CertUtil -hashfile \"%s\" MD5", path))
8989
return (s:match("\n(.*)\n(.*)") or ""):gsub(" ", "")
9090
else
@@ -95,7 +95,7 @@ end
9595
function os.extract_archive(archive_path, target_path, override)
9696
local flags = override and "-aoa" or "-aos"
9797

98-
if os.get() == "windows" then
98+
if os.host() == "windows" then
9999
os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)
100100
else
101101
os.executef("7z x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)

vendor/lua/premake5.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ project "Lua_Server"
2626
targetdir(buildpath("server/x64"))
2727

2828

29-
if os.get() == "windows" then
29+
if os.target() == "windows" then
3030
project "Lua_Client"
3131
language "C++"
3232
kind "SharedLib"

0 commit comments

Comments
 (0)