Fix 64-bit server output path

multitheftauto · Aug 1, 2016 · 0fe3108 · 0fe3108
1 parent 4505ace
commit 0fe3108
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 9 deletions.
diff --git a/Server/core/premake5.lua b/Server/core/premake5.lua
@@ -45,3 +45,6 @@ project "Core"
 
 	filter "system:linux"
 		links { "ncurses", "ncursesw", "breakpad", "pthread", "stdc++" }
+
+	filter "platforms:x64"
+		targetdir(buildpath("server/x64"))
diff --git a/Server/dbconmy/premake5.lua b/Server/dbconmy/premake5.lua
@@ -36,8 +36,10 @@ project "Dbconmy"
 		includedirs { "/usr/include/mysql" }
 		links { "mysqlclient" }
 
-	filter { "system:windows", "architecture:x64" }
+	filter { "system:windows", "platforms:x64" }
 		links { "../../vendor/mysql/lib/x64/libmysql.lib" }
-	filter { "system:windows", "architecture:x86" }
+	filter { "system:windows", "platforms:x86" }
 		links { "../../vendor/mysql/lib/x86/libmysql.lib" }
-
+
+	filter "platforms:x64"
+		targetdir(buildpath("server/x64"))
diff --git a/Server/launcher/premake5.lua b/Server/launcher/premake5.lua
@@ -33,3 +33,6 @@ project "Launcher"
 
 	filter {"system:linux", "platforms:x64"}
 		targetname "mta-server64"
+
+	filter {"system:windows", "platforms:x64"}
+		targetname "MTA Server64"
diff --git a/Server/mods/deathmatch/premake5.lua b/Server/mods/deathmatch/premake5.lua
@@ -34,7 +34,6 @@ project "Deathmatch"
 		"Lua_Server", "pthread", "sqlite", "ehs", "cryptopp", "pcre", "pme", "json-c", "zlib", "zip"
 	}
 
-
 	vpaths {
 		["Headers/*"] = {"**.h", "../../../**.h"},
 		["Sources/*"] = {"**.cpp", "../../../**.cpp"},
@@ -65,3 +64,5 @@ project "Deathmatch"
 	filter "system:not windows"
 		buildoptions { "-Wno-narrowing" } -- We should fix the warnings at some point
 
+	filter "platforms:x64"
+		targetdir(buildpath("server/x64"))
diff --git a/Shared/XML/premake5.lua b/Shared/XML/premake5.lua
@@ -35,3 +35,5 @@ project "XML"
 			copy "mta"
 		}
 
+	filter {"system:windows", "platforms:x64"}
+		targetdir(buildpath("server/x64"))
diff --git a/vendor/curl/lib/premake5.lua b/vendor/curl/lib/premake5.lua
@@ -8,7 +8,6 @@ project "curl"
 		"../include",
 		"../../zlib"
 	}
-
 
 	vpaths { 
 		["Headers"] = "**.h",
@@ -261,4 +260,7 @@ project "curl"
 		postbuildcommands {
 			copy "mta"
 		}
+
+	filter "platforms:x64"
+		targetdir(buildpath("server/x64"))
 
diff --git a/vendor/lua/premake5.lua b/vendor/lua/premake5.lua
@@ -22,6 +22,9 @@ project "Lua_Server"
 	filter "system:not windows"
 		kind "StaticLib"
 
+	filter {"system:windows", "platforms:x64"}
+		targetdir(buildpath("server/x64"))
+
 
 if os.get() == "windows" then
 	project "Lua_Client"
@@ -49,6 +52,6 @@ if os.get() == "windows" then
 		configuration "windows"
 			defines { "LUA_BUILD_AS_DLL" }
 
-        filter "architecture:x64"
+        filter "platforms:x64"
             flags { "ExcludeFromBuild" } 
 end
diff --git a/vendor/pcre/premake5.lua b/vendor/pcre/premake5.lua
@@ -52,13 +52,15 @@ project "pcre"
 
 	filter "system:windows"
 		kind "SharedLib"
-		 targetdir(buildpath("server/mods/deathmatch"))
+		targetdir(buildpath("server/mods/deathmatch"))
 
 	filter {"system:windows", "platforms:x86"}
 		postbuildcommands {
 			copy "mods/deathmatch"
 		}
 
+	filter {"system:windows", "platforms:x64"}
+		targetdir(buildpath("server/x64"))
+
 	filter "system:not windows"
 		kind "StaticLib"
-
diff --git a/vendor/pthreads/premake5.lua b/vendor/pthreads/premake5.lua
@@ -29,7 +29,10 @@ project "pthread"
 	filter {"system:windows", "platforms:x86"}
 		postbuildcommands {
 			copy "mta"
-		}		
+		}
+
+	filter {"system:windows", "platforms:x64"}
+		targetdir(buildpath("server/x64"))
 
 	filter "system:windows"
 		defines {