From 2f30ef000ac94d8b38fef5e3c0ca19b33398f88a Mon Sep 17 00:00:00 2001 From: ccw808 Date: Sun, 12 Feb 2017 21:14:51 +0000 Subject: [PATCH] Added post build commands for Windows x64 server --- utils/buildactions/install_data.lua | 9 ++++----- vendor/curl/lib/premake5.lua | 6 ++++++ vendor/pthreads/premake5.lua | 6 ++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/utils/buildactions/install_data.lua b/utils/buildactions/install_data.lua index 2839a6bd214..468a8f539dc 100644 --- a/utils/buildactions/install_data.lua +++ b/utils/buildactions/install_data.lua @@ -6,9 +6,8 @@ premake.modules.install_data = {} local BIN_DIR = "Bin" local DATA_DIR = "Shared/data/MTA San Andreas" --- TODO local NET_PATH_X86_WIN = "https://mirror.mtasa.com/bdata/net.dll" ---local NET_PATH_X64_WIN = "https://" +local NET_PATH_X64_WIN = "https://mirror.mtasa.com/bdata/net_64.dll" local NETC_PATH_WIN = "https://mirror.mtasa.com/bdata/netc.dll" local NET_PATH_X86_LINUX = "https://mirror.mtasa.com/bdata/net.so" @@ -27,7 +26,7 @@ newaction { os.copydir(DATA_DIR, BIN_DIR) end - -- Copy configs + -- Copy configs if they don't already exist os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.conf", false, true) os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.xml", false, true) @@ -36,12 +35,12 @@ newaction { if os.get() == "windows" then http.download(NET_PATH_X86_WIN, BIN_DIR.."/server/net.dll") - --http.download(NET_PATH_X64_WIN, BIN_DIR.."/server/x64/mods/net.dll") + http.download(NET_PATH_X64_WIN, BIN_DIR.."/server/x64/net.dll") http.download(NETC_PATH_WIN, BIN_DIR.."/MTA/netc.dll") os.copyfile(BIN_DIR.."/MTA/netc.dll", BIN_DIR.."/MTA/netc_d.dll") os.copyfile(BIN_DIR.."/server/net.dll", BIN_DIR.."/server/net_d.dll") - --os.copyfile("/server/x64/net.dll", "/server/x64/net_d.dll") + os.copyfile(BIN_DIR.."/server/x64/net.dll", BIN_DIR.."/server/x64/net_d.dll") else http.download(NET_PATH_X86_LINUX, BIN_DIR.."/server/net.so") http.download(NET_PATH_X64_LINUX, BIN_DIR.."/server/x64/net.so") diff --git a/vendor/curl/lib/premake5.lua b/vendor/curl/lib/premake5.lua index 7282f89c373..f1ca58bae21 100644 --- a/vendor/curl/lib/premake5.lua +++ b/vendor/curl/lib/premake5.lua @@ -269,6 +269,12 @@ project "curl" "copy \"%{wks.location}..\\Bin\\server\\libcurl_d.dll\" \"%{wks.location}..\\Bin\\server\\libcurl.dll\"" } + filter {"system:windows", "platforms:x64", "configurations:Debug"} + postbuildcommands { + -- Fix net.dll requiring the release build + "copy \"%{wks.location}..\\Bin\\server\\x64\\libcurl_d.dll\" \"%{wks.location}..\\Bin\\server\\x64\\libcurl.dll\"" + } + filter "platforms:x64" targetdir(buildpath("server/x64")) diff --git a/vendor/pthreads/premake5.lua b/vendor/pthreads/premake5.lua index fb00c6d1d15..c07e987978c 100644 --- a/vendor/pthreads/premake5.lua +++ b/vendor/pthreads/premake5.lua @@ -37,6 +37,12 @@ project "pthread" "copy \"%{wks.location}..\\Bin\\server\\pthread_d.dll\" \"%{wks.location}..\\Bin\\mta\\pthread.dll\"", "copy \"%{wks.location}..\\Bin\\server\\pthread_d.dll\" \"%{wks.location}..\\Bin\\server\\pthread.dll\"" } + + filter {"system:windows", "platforms:x64", "configurations:Debug"} + postbuildcommands { + -- Fix net.dll requiring the release build + "copy \"%{wks.location}..\\Bin\\server\\x64\\pthread_d.dll\" \"%{wks.location}..\\Bin\\server\\x64\\pthread.dll\"" + } filter {"system:windows", "platforms:x64"} targetdir(buildpath("server/x64"))