Skip to content

Commit a6e2554

Browse files
committed
Change premake configs to conform with the latest version
1 parent e6e3a2b commit a6e2554

File tree

10 files changed

+20
-23
lines changed

10 files changed

+20
-23
lines changed

premake5.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ workspace "MTASA"
2121
location "Build"
2222
startproject "Client Launcher"
2323

24-
flags { "C++11", "Symbols" }
24+
flags { "C++11" }
2525
characterset "MBCS"
2626
pic "On"
27+
symbols "On"
2728

2829
dxdir = os.getenv("DXSDK_DIR") or ""
2930
includedirs {
@@ -62,8 +63,7 @@ workspace "MTASA"
6263
end
6364

6465
filter {"system:windows", "configurations:Nightly", "kind:not StaticLib"}
65-
os.mkdir("Build/Symbols")
66-
linkoptions "/PDB:\"Symbols\\$(ProjectName).pdb\""
66+
symbolspath "Build/Symbols/$(ProjectName).pdb"
6767

6868
filter {"system:windows", "toolset:*140*"}
6969
defines { "_TIMESPEC_DEFINED" } -- fix pthread redefinition error, TODO: Remove when we fully moved to vs2015

utils/copy_net_dlls.bat

-2
This file was deleted.

vendor/cegui-0.4.0-custom/WidgetSets/Falagard/premake5.lua

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ project "Falagard"
77
pchsource "src/StdInc.cpp"
88

99
defines { "FALAGARDBASE_EXPORTS" }
10-
disablewarnings { "4297" }
1110

1211
includedirs {
1312
"include",
@@ -29,4 +28,7 @@ project "Falagard"
2928
filter "architecture:x64"
3029
flags { "ExcludeFromBuild" }
3130
filter "system:not windows"
32-
flags { "ExcludeFromBuild" }
31+
flags { "ExcludeFromBuild" }
32+
33+
filter {"system:windows"}
34+
disablewarnings { "4297" }

vendor/cegui-0.4.0-custom/premake5.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ project "CEGUI"
4646
filter "system:not windows"
4747
flags { "ExcludeFromBuild" }
4848

49-
50-
disablewarnings { "4221" }
5149
filter {"system:windows"}
5250
linkoptions { "/ignore:4221" }
51+
disablewarnings { "4221" }

vendor/cryptopp/premake5.lua

+1-6
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,9 @@ project "cryptopp"
147147
"x64masm.asm"
148148
}
149149

150-
-- C++11 build fails with GCC4.8/4.9
151-
-- See https://github.com/weidai11/cryptopp/issues/206
152-
filter "system:not windows"
153-
removeflags { "C++14" }
154-
155-
disablewarnings { "4005" }
156150
filter {"system:windows"}
157151
linkoptions { "/ignore:4221" }
152+
disablewarnings { "4005" }
158153

159154
filter {"system:windows", "toolset:*_xp*"}
160155
defines { "USE_MS_CRYPTOAPI", "_WIN32_WINNT=0x502", "NTDDI_VERSION=0x05020300" }

vendor/ehs/premake5.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ project "ehs"
55
includedirs { "../pcre", "../pme" }
66

77
defines { "WIN32_LEAN_AND_MEAN", "_LIB" }
8-
disablewarnings { "4800" }
98

109
vpaths {
1110
["Headers/*"] = "**.h",
@@ -25,4 +24,5 @@ project "ehs"
2524
}
2625

2726
filter "system:windows"
28-
includedirs { "../pthreads/include" }
27+
includedirs { "../pthreads/include" }
28+
disablewarnings { "4800" }

vendor/json-c/premake5.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ project "json-c"
55

66
includedirs { "." }
77
defines { "_LIB" }
8-
disablewarnings { "4244" }
98

109
vpaths {
1110
["Headers/*"] = "**.h",
@@ -21,6 +20,7 @@ project "json-c"
2120

2221
filter "system:windows"
2322
includedirs { "shipped_for_mta_win32" }
23+
disablewarnings { "4244" }
2424

2525
filter "system:not windows"
2626
includedirs { "shipped_for_mta_linux" }

vendor/pcre/premake5.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ project "pcre"
3434
defines { "HAVE_STRTOLL" }
3535
kind "StaticLib"
3636

37-
disablewarnings { "4251" }
3837
filter {"system:windows"}
3938
linkoptions { "/ignore:4217", "/ignore:4049" }
39+
disablewarnings { "4251" }

vendor/sqlite/premake5.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ project "sqlite"
22
language "C++"
33
kind "StaticLib"
44
targetname "sqlite"
5-
6-
disablewarnings { "4996" }
75

86
vpaths {
97
["Headers/*"] = "**.h",
@@ -16,4 +14,7 @@ project "sqlite"
1614
"*.h",
1715
"*.c"
1816
}
17+
18+
filter {"system:windows"}
19+
disablewarnings { "4996" }
1920

vendor/tinygettext/premake5.lua

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ project "tinygettext"
44
targetname "tinygettext"
55

66
includedirs { "." }
7-
disablewarnings { "4800", "4309", "4503", "4099", "4503" }
87

98
vpaths {
109
["Headers/*"] = "**.hpp",
@@ -19,4 +18,7 @@ project "tinygettext"
1918
}
2019

2120
filter "architecture:x64"
22-
flags { "ExcludeFromBuild" }
21+
flags { "ExcludeFromBuild" }
22+
23+
filter "system:windows"
24+
disablewarnings { "4800", "4309", "4503", "4099", "4503" }

0 commit comments

Comments
 (0)