Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

.gitignore

-/expansions
-/specials
-/obj
-/bin
-/build
-/event
-/lua
-/sqlite3
-/replay
-/deck
-/.vscode
-/gframe/ygopro.ico
-/gframe/ygopro.rc
-/gframe/ygopro.aps
-ygopro
-premake5.exe
-premake5
+/specials
+/replay
+/deck
+
+/deck
+/expansions
+/fonts
+/icon
+/pack
+/pics
+/replay
+/single
+/WindBot
+/cards.cdb
+/error.log
+/bot.conf
+/Bot.exe
+/bot
+
+/ygopro
+/ygopro.exe
+/ygopro.app
+
+/bin
+/build
+/obj
+/event
+/freetype
+/irrlicht
+/irrklang
+/ikpmp3
+/lua
+/sqlite3
+/gframe/*.ico
+/gframe/ygopro.rc
+/gframe/ygopro.aps
+/premake5
+/premake5.exe

gframe/game.cpp

@@ -1547,7 +1547,6 @@ void Game::ShowCardInfo(int code, bool resize) {
 	if(!dataManager.GetData(code, &cd))
 		memset(&cd, 0, sizeof(CardData));
 	imgCard->setImage(imageManager.GetTexture(code, true));
-	imgCard->setScaleImage(true);
 	if(cd.alias != 0 && (cd.alias - code < CARD_ARTWORK_VERSIONS_OFFSET || code - cd.alias < CARD_ARTWORK_VERSIONS_OFFSET))
 		myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(cd.alias), cd.alias);
 	else myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code);
@@ -1727,9 +1726,7 @@ void Game::ErrorLog(const char* msg) {
 }
 void Game::ClearTextures() {
 	matManager.mCard.setTexture(0, 0);
-	imgCard->setImage(imageManager.tCover[0]);
-	scrCardText->setVisible(false);
-	imgCard->setScaleImage(true);
+	ClearCardInfo(0);
 	btnPSAU->setImage();
 	btnPSDU->setImage();
 	for(int i=0; i<=4; ++i) {

gframe/lzma/premake4.lua → gframe/lzma/premake5.lua

 project "clzma"
     kind "StaticLib"
-    files { "**.c", "**.h" }
+    files { "*.c", "*.h" }

gframe/premake4.lua

-include "lzma/."
-
-project "ygopro"
-    kind "ConsoleApp"
-	
-    defines { "YGOPRO_SERVER_MODE" }
-
-    files { "gframe.cpp", "config.h",
-            "game.cpp", "game.h", "myfilesystem.h",
-            "deck_manager.cpp", "deck_manager.h",
-            "data_manager.cpp", "data_manager.h",
-            "replay.cpp", "replay.h",
-            "netserver.cpp", "netserver.h",
-            "single_duel.cpp", "single_duel.h",
-            "tag_duel.cpp", "tag_duel.h" }
-    includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "sqlite3", "event"}
-
-    configuration "windows"
-        files "ygopro.rc"
-        includedirs { "../event/include", "../sqlite3" }
-        links { "ws2_32", "lua" }
-    configuration "not vs*"
-        buildoptions { "-std=c++14", "-fno-rtti" }
-    configuration "not windows"
-        links { "lua5.3-c++", "event_pthreads", "dl", "pthread" }

gframe/premake5.lua

+include "lzma/."
+include "spmemvfs/."
+
+project "YGOPro"
+    kind "WindowedApp"
+
+    files { "*.cpp", "*.h" }
+    includedirs { "../ocgcore" }
+    links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" }
+
+    if BUILD_EVENT then
+        includedirs { "../event/include" }
+    else
+        includedirs { EVENT_INCLUDE_DIR }
+        libdirs { EVENT_LIB_DIR }
+    end
+
+    if BUILD_IRRLICHT then
+        includedirs { "../irrlicht/include" }
+    else
+        includedirs { IRRLICHT_INCLUDE_DIR }
+        libdirs { IRRLICHT_LIB_DIR }
+    end
+
+    if BUILD_FREETYPE then
+        includedirs { "../freetype/include" }
+    else
+        includedirs { FREETYPE_INCLUDE_DIR }
+        libdirs { FREETYPE_LIB_DIR }
+    end
+
+    if BUILD_SQLITE then
+        includedirs { "../sqlite3" }
+    else
+        includedirs { SQLITE_INCLUDE_DIR }
+        libdirs { SQLITE_LIB_DIR }
+    end
+
+    if USE_IRRKLANG then
+        defines { "YGOPRO_USE_IRRKLANG" }
+        includedirs { IRRKLANG_INCLUDE_DIR }
+        if not IRRKLANG_PRO then
+            libdirs { IRRKLANG_LIB_DIR }
+        end
+    end
+
+    filter "system:windows"
+        defines { "_IRR_WCHAR_FILESYSTEM" }
+        files "ygopro.rc"
+        libdirs { "$(DXSDK_DIR)Lib/x86" }
+        if USE_IRRKLANG then
+            links { "irrKlang" }
+            if IRRKLANG_PRO then
+                defines { "IRRKLANG_STATIC" }
+                links { "ikpmp3" }
+                filter { "not configurations:Debug" }
+                    libdirs { IRRKLANG_PRO_RELEASE_LIB_DIR }
+                filter { "configurations:Debug" }
+                    libdirs { IRRKLANG_PRO_DEBUG_LIB_DIR }
+                filter {}
+            end
+        end
+        links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
+    filter "not action:vs*"
+        buildoptions { "-std=c++14", "-fno-rtti" }
+    filter "not system:windows"
+        links { "event_pthreads", "dl", "pthread" }
+    filter "system:macosx"
+        links { "z" }
+        defines { "GL_SILENCE_DEPRECATION" }
+        if MAC_ARM then
+            buildoptions { "--target=arm64-apple-macos12" }
+            linkoptions { "-arch arm64" }
+        end
+        if USE_IRRKLANG then
+            links { "irrklang" }
+        end
+    filter "system:linux"
+        links { "GL", "X11", "Xxf86vm" }
+        if USE_IRRKLANG then
+            links { "IrrKlang" }
+            linkoptions{ IRRKLANG_LINK_RPATH }
+        end

gframe/spmemvfs/premake4.lua → gframe/spmemvfs/premake5.lua

 project "cspmemvfs"
     kind "StaticLib"
-    files { "**.c", "**.h" }
+    files { "*.c", "*.h" }
 
-    configuration "windows"
+    if BUILD_SQLITE then
         includedirs { "../../sqlite3" }
+    end

ocgcore @ 1e36a1e9

-Subproject commit 2caa39734a468d4b0c5b3fe37d2179aa533301ce
+Subproject commit 1e36a1e98d6f05857e98145608716b738fd78d86

premake/event/premake5.lua

+project "event"
+    kind "StaticLib"
+
+    includedirs { "include", "compat" }
+
+    files { "event.c", "evthread.c", "buffer.c", "bufferevent.c", "bufferevent_sock.c",
+            "bufferevent_filter.c", "bufferevent_pair.c", "listener.c", "bufferevent_ratelim.c",
+            "evmap.c", "log.c", "evutil.c", "evutil_rand.c", "strlcpy.c", "signal.c", 
+            "event_tagging.c", "http.c", "evdns.c", "evrpc.c" }
+
+    filter "system:windows"
+        prebuildcommands { "xcopy /E /Y $(ProjectDir)..\\event\\WIN32-Code $(ProjectDir)..\\event\\include" }
+        files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }

premake/freetype/premake5.lua

+project "freetype"
+    kind "StaticLib"
+
+    includedirs { "include" }
+    defines { "FT2_BUILD_LIBRARY" }
+
+    files { "src/autofit/autofit.c",
+            "src/base/ftbase.c",
+            "src/base/ftbbox.c",
+            "src/base/ftbdf.c",
+            "src/base/ftbitmap.c",
+            "src/base/ftcid.c",
+            "src/base/ftfstype.c",
+            "src/base/ftgasp.c",
+            "src/base/ftglyph.c",
+            "src/base/ftgxval.c",
+            "src/base/ftinit.c",
+            "src/base/ftmm.c",
+            "src/base/ftotval.c",
+            "src/base/ftpatent.c",
+            "src/base/ftpfr.c",
+            "src/base/ftstroke.c",
+            "src/base/ftsynth.c",
+            "src/base/fttype1.c",
+            "src/base/ftwinfnt.c",
+            "src/bdf/bdf.c",
+            "src/cache/ftcache.c",
+            "src/cff/cff.c",
+            "src/cid/type1cid.c",
+            "src/gzip/ftgzip.c",
+            "src/lzw/ftlzw.c",
+            "src/pcf/pcf.c",
+            "src/pfr/pfr.c",
+            "src/psaux/psaux.c",
+            "src/pshinter/pshinter.c",
+            "src/psnames/psmodule.c",
+            "src/raster/raster.c",
+            "src/sfnt/sfnt.c",
+            "src/sdf/sdf.c",
+            "src/smooth/smooth.c",
+            "src/truetype/truetype.c",
+            "src/type1/type1.c",
+            "src/type42/type42.c",
+            "src/winfonts/winfnt.c" }
+
+    filter "system:windows"
+        files { "builds/windows/ftsystem.c",
+                "builds/windows/ftdebug.c" }
+
+    filter "not system:windows"
+        files { "src/base/ftsystem.c",
+                "src/base/ftdebug.c" }

premake/gframe/ygopro.rc

 1 ICON "ygopro.ico"
 
 1 VERSIONINFO
-FILEVERSION 1, 0, 33, 12
-PRODUCTVERSION 1, 0, 33, 12
+FILEVERSION 1, 0, 35, 3
+PRODUCTVERSION 1, 0, 35, 3
 FILEOS 0x4
 FILETYPE 0x1
 
@@ -11,13 +11,13 @@ BLOCK "StringFileInfo"
 BEGIN
 BLOCK "080404b0"
 BEGIN
-VALUE "FileDescription", "YGOPRO Server Mode ver.233"
-VALUE "InternalName", "YGOPRO Server Mode"
-VALUE "LegalCopyright", "Copyright (C) 2016 Fluorohydride"
-VALUE "OriginalFilename", "ygopro.exe"
-VALUE "ProductName", "YGOPRO Server Mode"
-VALUE "FileVersion", "1.033.C.233"
-VALUE "ProductVersion", "1.033.C.233"
+VALUE "FileDescription", "YGOPro Server Mode"
+VALUE "InternalName", "YGOPro Server Mode"
+VALUE "LegalCopyright", "Copyright (C) 2022 Fluorohydride"
+VALUE "OriginalFilename", "YGOPro.exe"
+VALUE "ProductName", "YGOPro Server Mode"
+VALUE "FileVersion", "1.035.3"
+VALUE "ProductVersion", "1.035.3"
 END
 END
 BLOCK "VarFileInfo"

premake/lua/premake5.lua

+project "lua"
+    kind "StaticLib"
+
+    files { "src/*.c", "src/*.h", "src/*.hpp" }
+    removefiles { "src/lua.c", "src/luac.c" }
+
+    filter "action:vs*"
+        buildoptions { "/TP" }
+
+    filter "not action:vs*"
+        buildoptions { "-x c++" }
+
+    filter "system:bsd"
+        defines { "LUA_USE_POSIX" }
+
+    filter "system:macosx"
+        defines { "LUA_USE_MACOSX" }
+
+    filter "system:linux"
+        defines { "LUA_USE_LINUX" }

premake/sqlite3/premake5.lua

+project "sqlite3"
+    kind "StaticLib"
+
+    files { "sqlite3.c", "sqlite3.h" }

premake4.lua

-solution "ygo"
-    location "build"
-    language "C++"
-    objdir "obj"
-
-    configurations { "Debug", "Release" }
-
-    configuration "windows"
-        defines { "WIN32", "_WIN32" }
-
-    configuration "bsd"
-        defines { "LUA_USE_POSIX" }
-        includedirs { "/usr/local/include" }
-        libdirs { "/usr/local/lib" }
-
-    configuration "macosx"
-        defines { "LUA_USE_MACOSX" }
-        includedirs { "/opt/local/include" }
-        libdirs { "/opt/local/lib" }
-
-    configuration "linux"
-        defines { "LUA_USE_LINUX" }
-
-    configuration "vs*"
-        flags "EnableSSE2"
-        buildoptions { "-wd4996", "/utf-8" }
-        defines { "_CRT_SECURE_NO_WARNINGS" }
-
-    configuration "not vs*"
-        buildoptions { "-fno-strict-aliasing", "-Wno-format-security" }
-    configuration {"not vs*", "windows"}
-        buildoptions { "-static-libgcc" }
-
-    configuration "Debug"
-        flags "Symbols"
-        defines "_DEBUG"
-        targetdir "bin/debug"
-
-    configuration { "Release", "not vs*" }
-        flags "Symbols"
-        defines "NDEBUG"
-        buildoptions "-march=native"
-
-    configuration "Release"
-        flags { "OptimizeSpeed" }
-        targetdir "bin/release"
-
-    include "ocgcore"
-    include "gframe"
-    if os.is("windows") then
-    include "lua"
-    include "event"
-    include "freetype"
-    include "irrlicht"
-    include "sqlite3"
-    end

premake5.lua

-solution "ygo"
+-- default global settings
+
+BUILD_LUA = true
+BUILD_EVENT = os.istarget("windows")
+BUILD_FREETYPE = os.istarget("windows")
+BUILD_SQLITE = os.istarget("windows")
+BUILD_IRRLICHT = not os.istarget("macosx")
+USE_IRRKLANG = true
+IRRKLANG_PRO = false
+LUA_LIB_NAME = "lua"
+
+-- read settings from command line or environment variables
+
+newoption { trigger = "build-lua", category = "YGOPro - lua", description = "" }
+newoption { trigger = "no-build-lua", category = "YGOPro - lua", description = "" }
+newoption { trigger = "lua-include-dir", category = "YGOPro - lua", description = "", value = "PATH" }
+newoption { trigger = "lua-lib-dir", category = "YGOPro - lua", description = "", value = "PATH" }
+newoption { trigger = "lua-lib-name", category = "YGOPro - lua", description = "", value = "NAME", default = "lua" }
+
+newoption { trigger = "build-event", category = "YGOPro - event", description = "" }
+newoption { trigger = "no-build-event", category = "YGOPro - event", description = "" }
+newoption { trigger = "event-include-dir", category = "YGOPro - event", description = "", value = "PATH" }
+newoption { trigger = "event-lib-dir", category = "YGOPro - event", description = "", value = "PATH" }
+
+newoption { trigger = "build-freetype", category = "YGOPro - freetype", description = "" }
+newoption { trigger = "no-build-freetype", category = "YGOPro - freetype", description = "" }
+newoption { trigger = "freetype-include-dir", category = "YGOPro - freetype", description = "", value = "PATH" }
+newoption { trigger = "freetype-lib-dir", category = "YGOPro - freetype", description = "", value = "PATH" }
+
+newoption { trigger = "build-sqlite", category = "YGOPro - sqlite", description = "" }
+newoption { trigger = "no-build-sqlite", category = "YGOPro - sqlite", description = "" }
+newoption { trigger = "sqlite-include-dir", category = "YGOPro - sqlite", description = "", value = "PATH" }
+newoption { trigger = "sqlite-lib-dir", category = "YGOPro - sqlite", description = "", value = "PATH" }
+
+newoption { trigger = "build-irrlicht", category = "YGOPro - irrlicht", description = "" }
+newoption { trigger = "no-build-irrlicht", category = "YGOPro - irrlicht", description = "" }
+newoption { trigger = "irrlicht-include-dir", category = "YGOPro - irrlicht", description = "", value = "PATH" }
+newoption { trigger = "irrlicht-lib-dir", category = "YGOPro - irrlicht", description = "", value = "PATH" }
+
+newoption { trigger = "use-irrklang", category = "YGOPro - irrklang", description = "" }
+newoption { trigger = "no-use-irrklang", category = "YGOPro - irrklang", description = "" }
+newoption { trigger = "irrklang-include-dir", category = "YGOPro - irrklang", description = "", value = "PATH" }
+newoption { trigger = "irrklang-lib-dir", category = "YGOPro - irrklang", description = "", value = "PATH" }
+
+newoption { trigger = "irrklang-pro", category = "YGOPro - irrklang - pro", description = "" }
+newoption { trigger = "no-irrklang-pro", category = "YGOPro - irrklang - pro", description = "" }
+newoption { trigger = "irrklang-pro-release-lib-dir", category = "YGOPro - irrklang - pro", description = "", value = "PATH" }
+newoption { trigger = "irrklang-pro-debug-lib-dir", category = "YGOPro - irrklang - pro", description = "", value = "PATH" }
+
+newoption { trigger = "winxp-support", category = "YGOPro", description = "" }
+newoption { trigger = "mac-arm", category = "YGOPro", description = "M1" }
+
+function GetParam(param)
+    return _OPTIONS[param] or os.getenv(string.upper(string.gsub(param,"-","_")))
+end
+
+if GetParam("build-lua") then
+    BUILD_LUA = true
+elseif GetParam("no-build-lua") then
+    BUILD_LUA = false
+end
+if not BUILD_LUA then
+    -- at most times you need to change this if you change BUILD_LUA to false
+    -- make sure your lua lib is built with C++ and version >= 5.3
+    LUA_INCLUDE_DIR = GetParam("lua-include-dir") or "/usr/local/include/lua"
+    LUA_LIB_DIR = GetParam("lua-lib-dir") or "/usr/local/lib"
+    LUA_LIB_NAME = GetParam("lua-lib-name")
+end
+
+if GetParam("build-event") then
+    BUILD_EVENT = os.istarget("windows") -- only on windows for now
+elseif GetParam("no-build-event") then
+    BUILD_EVENT = false
+end
+if not BUILD_EVENT then
+    EVENT_INCLUDE_DIR = GetParam("event-include-dir") or "/usr/local/include/event2"
+    EVENT_LIB_DIR = GetParam("event-lib-dir") or "/usr/local/lib"
+end
+
+if GetParam("build-freetype") then
+    BUILD_FREETYPE = true
+elseif GetParam("no-build-freetype") then
+    BUILD_FREETYPE = false
+end
+if not BUILD_FREETYPE then
+    if os.istarget("linux") then
+        FREETYPE_INCLUDE_DIR = "/usr/include/freetype2"
+    elseif os.istarget("macosx") then
+        FREETYPE_INCLUDE_DIR = "/usr/local/include/freetype2"
+    end
+    FREETYPE_INCLUDE_DIR = GetParam("freetype-include-dir") or FREETYPE_INCLUDE_DIR
+    FREETYPE_LIB_DIR = GetParam("freetype-lib-dir") or "/usr/local/lib"
+end
+
+if GetParam("build-sqlite") then
+    BUILD_SQLITE = true
+elseif GetParam("no-build-sqlite") then
+    BUILD_SQLITE = false
+end
+if not BUILD_SQLITE then
+    SQLITE_INCLUDE_DIR = GetParam("sqlite-include-dir") or "/usr/local/include"
+    SQLITE_LIB_DIR = GetParam("sqlite-lib-dir") or "/usr/local/lib"
+end
+
+if GetParam("build-irrlicht") then
+    BUILD_IRRLICHT = true
+elseif GetParam("no-build-irrlicht") then
+    BUILD_IRRLICHT = false
+end
+if not BUILD_IRRLICHT then
+    IRRLICHT_INCLUDE_DIR = GetParam("irrlicht-include-dir") or "/usr/local/include/irrlicht"
+    IRRLICHT_LIB_DIR = GetParam("irrlicht-lib-dir") or "/usr/local/lib"
+end
+
+if GetParam("use-irrklang") then
+    USE_IRRKLANG = true
+elseif GetParam("no-use-irrklang") then
+    USE_IRRKLANG = false
+end
+if USE_IRRKLANG then
+    IRRKLANG_INCLUDE_DIR = GetParam("irrklang-include-dir") or "../irrklang/include"
+    if os.istarget("windows") then
+        IRRKLANG_LIB_DIR = "../irrklang/lib/Win32-visualStudio"
+    elseif os.istarget("linux") then
+        IRRKLANG_LIB_DIR = "../irrklang/bin/linux-gcc-64"
+        IRRKLANG_LINK_RPATH = "-Wl,-rpath=./irrklang/bin/linux-gcc-64/"
+    elseif os.istarget("macosx") then
+        IRRKLANG_LIB_DIR = "../irrklang/bin/macosx-gcc"
+    end
+    IRRKLANG_LIB_DIR = GetParam("irrklang-lib-dir") or IRRKLANG_LIB_DIR
+end
+
+if GetParam("irrklang-pro") and os.istarget("windows") then
+    IRRKLANG_PRO = true
+elseif GetParam("no-irrklang-pro") then
+    IRRKLANG_PRO = false
+end
+if IRRKLANG_PRO then
+    -- irrklang pro can't use the pro lib to debug
+    IRRKLANG_PRO_RELEASE_LIB_DIR = GetParam("irrklang-pro-release-lib-dir") or "../irrklang/lib/Win32-vs2019"
+    IRRKLANG_PRO_DEBUG_LIB_DIR = GetParam("irrklang-pro-debug-lib-dir") or "../irrklang/lib/Win32-visualStudio-debug"  
+end
+
+if GetParam("winxp-support") and os.istarget("windows") then
+    WINXP_SUPPORT = true
+end
+if GetParam("mac-arm") and os.istarget("macosx") then
+    MAC_ARM = true
+end
+
+workspace "YGOPro"
     location "build"
     language "C++"
     objdir "obj"
 
-    if os.ishost("windows") then
-        BUILD_LUA=true
-    end
-
     configurations { "Release", "Debug" }
 
-    configuration "windows"
+    filter "system:windows"
         defines { "WIN32", "_WIN32" }
+        entrypoint "mainCRTStartup"
+        systemversion "latest"
+        startproject "YGOPro"
+        if WINXP_SUPPORT then
+            defines { "WINVER=0x0501" }
+            toolset "v141_xp"
+        else
+            defines { "WINVER=0x0601" } -- WIN7
+        end
 
-    configuration "linux"
-        defines { "LUA_USE_LINUX" }
+    filter "system:macosx"
+        libdirs { "/usr/local/lib" }
+        buildoptions { "-stdlib=libc++" }
+        if MAC_ARM then
+            buildoptions { "--target=arm64-apple-macos12" }
+        end
+        links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }
 
-    configuration "Release"
+    filter "system:linux"
+        buildoptions { "-U_FORTIFY_SOURCE" }
+
+    filter "configurations:Release"
+        optimize "Speed"
         targetdir "bin/release"
 
-    configuration "Debug"
+    filter "configurations:Debug"
         symbols "On"
         defines "_DEBUG"
         targetdir "bin/debug"
 
-    configuration { "Release", "vs*" }
-        optimize "Speed"
+    filter { "configurations:Release", "action:vs*" }
         flags { "LinkTimeOptimization" }
         staticruntime "On"
         disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800" }
 
-    configuration { "Release", "not vs*" }
+    filter { "configurations:Release", "not action:vs*" }
         symbols "On"
         defines "NDEBUG"
-        buildoptions "-march=native"
+        if not MAC_ARM then
+            buildoptions "-march=native"
+        end
 
-    configuration { "Debug", "vs*" }
+    filter { "configurations:Debug", "action:vs*" }
         defines { "_ITERATOR_DEBUG_LEVEL=0" }
+        disablewarnings { "4819", "4828" }
 
-    configuration "vs*"
+    filter "action:vs*"
         vectorextensions "SSE2"
         buildoptions { "/utf-8" }
         defines { "_CRT_SECURE_NO_WARNINGS" }
+    
+    filter "not action:vs*"
+        buildoptions { "-fno-strict-aliasing", "-Wno-multichar", "-Wno-format-security" }
 
-    configuration "not vs*"
-        buildoptions { "-fno-strict-aliasing", "-Wno-multichar" }
-
-    configuration {"not vs*", "windows"}
-        buildoptions { "-static-libgcc" }
-
-    startproject "ygopro"
+    filter {}
 
     include "ocgcore"
     include "gframe"
-    if os.ishost("windows") then
-    include "lua"
-    include "event"
-    include "sqlite3"
+    if BUILD_LUA then
+        include "lua"
+    end
+    if BUILD_EVENT then
+        include "event"
+    end
+    if BUILD_FREETYPE then
+        include "freetype"
+    end
+    if BUILD_IRRLICHT then
+        include "irrlicht"
+    end
+    if BUILD_SQLITE then
+        include "sqlite3"
+    end
+    if USE_IRRKLANG and IRRKLANG_PRO then
+        include "ikpmp3"
     end

script @ c637be96

-Subproject commit 97bbddc05f32aeab9127fdb50f93c2de380d51fd
+Subproject commit c637be9669d4dfe2c5bd34bf1c93f717cb2fe321

strings.conf

@@ -267,6 +267,7 @@
 !system 1190 加入手卡
 !system 1191 送去墓地
 !system 1192 除外
+!system 1193 回到卡组
 #menu
 !system 1200 联机模式
 !system 1201 单人模式