add mdpro2 build

.gitlab-ci.yml

@@ -124,6 +124,15 @@ exec_windows:
     - mkdir dist\windows
     - copy bin\release\x64\ygopro.exe dist\windows\ygopro.exe
 
+exec_windows_pro2:
+  extends: .exec_windows
+  script:
+    - '.\premake5.exe vs2019 --server-pro2-support'
+    - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release /p:Platform=x64'
+    - mkdir dist
+    - mkdir dist\windows
+    - copy bin\release\x64\AI.Server.exe dist\windows\AI.Server.exe
+
 exec_windows_pro3:
   extends: .exec_windows
   script:
@@ -133,6 +142,15 @@ exec_windows_pro3:
     - mkdir dist\windows
     - copy bin\release\x64\ygoserver.dll dist\windows\ygoserver.dll
 
+exec_windows_mdpro2:
+  extends: .exec_windows
+  script:
+    - '.\premake5.exe vs2019 --server-pro3-support --log-in-chat --server-pro2-support'
+    - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release /p:Platform=x64'
+    - mkdir dist
+    - mkdir dist\windows
+    - copy bin\release\x64\ygoserver.dll dist\windows\ygoserver-mdpro2.dll
+
 .exec_unix_common:
   extends: ._exec_build
   variables:
@@ -321,6 +339,8 @@ upload_to_minio:
     - exec_linux
     - exec_linuxarm
     - exec_windows_pro3
+    - exec_windows_pro2
+    - exec_windows_mdpro2
     - exec_linux_pro3
     - exec_linuxarm_pro3
     - exec_debian

gframe/deck_manager.cpp

@@ -50,8 +50,7 @@ void DeckManager::LoadLFListSingle(irr::io::IReadFile* reader, bool insert) {
 void DeckManager::LoadLFList() {
 #ifdef SERVER_PRO2_SUPPORT
 	LoadLFListSingle("config/lflist.conf");
-#endif
-#ifdef SERVER_PRO3_SUPPORT
+#elif defined(SERVER_PRO3_SUPPORT)
 	LoadLFListSingle("Data/lflist.conf");
 #endif
 	LoadLFListSingle("specials/lflist.conf");

gframe/game.cpp

@@ -101,8 +101,7 @@ void Game::MainServerLoop() {
 	LoadExpansionsAll();
 #ifdef SERVER_PRO2_SUPPORT
 	DataManager::FileSystem->addFileArchive("data/script.zip", true, false, irr::io::EFAT_ZIP);
-#endif
-#ifdef SERVER_PRO3_SUPPORT
+#elif defined(SERVER_PRO3_SUPPORT)
 	DataManager::FileSystem->addFileArchive("Data/script.zip", true, false, irr::io::EFAT_ZIP);
 #endif
 
@@ -1419,8 +1418,7 @@ void Game::LoadExpansionsAll() {
 			dataManager.LoadDB(fpath);
 		}
 	});
-#endif // SERVER_PRO2_SUPPORT
-#ifdef SERVER_PRO3_SUPPORT
+#elif defined(SERVER_PRO3_SUPPORT)
 	FileSystem::TraversalDir(L"./Data/locales/zh-CN", [](const wchar_t* name, bool isdir) {
 		wchar_t fpath[1024];
 		myswprintf(fpath, L"./Data/locales/zh-CN/%ls", name);

gframe/netserver.cpp

@@ -95,7 +95,7 @@ bool NetServer::StartServer(unsigned short port) {
 	std::memset(&sin, 0, sizeof sin);
 	server_port = port;
 	sin.sin_family = AF_INET;
-#ifdef SERVER_PRO2_SUPPORT
+#if defined(SERVER_PRO2_SUPPORT) && !defined(SERVER_PRO3_SUPPORT)
 	sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 #else
 	sin.sin_addr.s_addr = htonl(INADDR_ANY);

gframe/premake5.lua

@@ -119,7 +119,7 @@ if not SERVER_PRO3_SUPPORT then
 end
         defines { "_IRR_WCHAR_FILESYSTEM" }
         files "ygopro.rc"
-if SERVER_PRO2_SUPPORT then
+if SERVER_PRO2_SUPPORT and not SERVER_PRO3_SUPPORT then
         targetname ("AI.Server")
 end
 if SERVER_MODE then