Skip to content

Commit 800f1fa

Browse files
committed
Fix linux compilation
1 parent 943503a commit 800f1fa

File tree

5 files changed

+997
-5
lines changed

5 files changed

+997
-5
lines changed

Server/launcher/premake5.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ project "Launcher"
2727
}
2828

2929
filter "system:linux"
30-
links { "dl", "pthread" }
30+
links { "dl" }
31+
buildoptions { "-pthread" }
32+
linkoptions { "-pthread" }
3133

3234
filter {"system:linux", "platforms:x86"}
3335
targetname "mta-server"

Server/mods/deathmatch/premake5.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ project "Deathmatch"
3232

3333
defines { "SDK_WITH_BCRYPT" }
3434
links {
35-
"Lua_Server", "pthread", "sqlite", "ehs", "cryptopp", "pme", "pcre", "json-c", "zip", "zlib", "blowfish_bcrypt",
35+
"Lua_Server", "sqlite", "ehs", "cryptopp", "pme", "pcre", "json-c", "zip", "zlib", "blowfish_bcrypt",
3636
}
3737

3838
vpaths {
@@ -59,11 +59,13 @@ project "Deathmatch"
5959
filter "system:windows"
6060
includedirs { "../../../vendor/pthreads/include" }
6161
buildoptions { "-Zm130" }
62-
links { "ws2_32" }
62+
links { "ws2_32", "pthread" }
6363

6464
filter "system:not windows"
6565
buildoptions { "-Wno-narrowing" } -- We should fix the warnings at some point
6666
links { "rt" }
67+
buildoptions { "-pthread" }
68+
linkoptions { "-pthread" }
6769

6870
filter "platforms:x64"
6971
targetdir(buildpath("server/x64"))

0 commit comments

Comments
 (0)