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

.gitignore

-/bin/
-/build/
-/event/
-/freetype/
-/gframe/ygopro.ico
+.DS_Store
+
+/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
-/irrlicht/
-/lua/
-/obj/
-/sqlite3/
-premake5.exe
+/premake5
+/premake5.exe

.gitlab-ci.yml

@@ -16,7 +16,7 @@ mat_common:
   script:
     # lua
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/lua-5.3.5.tar.gz | tar zfx -
-    - mv lua-5.3.5/src lua
+    - mv lua-5.3.5 lua
     # sqlite3
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/sqlite-autoconf-3360000.tar.gz | tar zfx -
     - mv sqlite-autoconf-3360000 sqlite3
@@ -53,7 +53,7 @@ mat_linux:
   script:
     - apt update; apt -y install git wget tar
     - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-linux.tar.gz | tar zfx -
+    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta1-linux.tar.gz | tar zfx -
     - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
   artifacts:
     paths:
@@ -100,7 +100,7 @@ mat_macos:
     - linux
   script:
     - apt update; apt -y install wget tar
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-macosx.tar.gz | tar zfx -
+    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta1-macosx.tar.gz | tar zfx -
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libirrklang-patched-dylib.tar.gz | tar zfx -
     - mkdir irrlicht
     - cd irrlicht
@@ -119,11 +119,11 @@ mat_windows:
   script:
     - apt update; apt -y install wget tar patch p7zip-full
     # premake5.exe
-    - wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-windows.zip
-    - 7z x -y premake-5.0.0-alpha14-windows.zip
+    - wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta1-windows.zip
+    - 7z x -y premake-5.0.0-beta1-windows.zip
     # event
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
-    - mv libevent-2.0.22-stable event ; cp -rf event/WIN32-Code/* event/include
+    - mv libevent-2.0.22-stable event
     # irrlicht
     - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
   artifacts:
@@ -141,7 +141,7 @@ exec_windows:
     - mat_irrklang
     - mat_windows
   variables:
-    irrklang_pro: '1'
+    IRRKLANG_PRO: '1'
     USE_IRRKLANG: "1"
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"

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

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

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 @ b2fe87f6

-Subproject commit 2caa39734a468d4b0c5b3fe37d2179aa533301ce
+Subproject commit b2fe87f60fa39a3e74c7626c3ed65144bbdc4b11

premake/event/premake4.lua → premake/event/premake5.lua

@@ -8,5 +8,6 @@ project "event"
             "evmap.c", "log.c", "evutil.c", "evutil_rand.c", "strlcpy.c", "signal.c", 
             "event_tagging.c", "http.c", "evdns.c", "evrpc.c" }
 
-    configuration "windows"
+    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/premake4.lua → premake/freetype/premake5.lua

@@ -21,7 +21,6 @@ project "freetype"
             "src/base/ftpfr.c",
             "src/base/ftstroke.c",
             "src/base/ftsynth.c",
-            "src/base/ftsystem.c",
             "src/base/fttype1.c",
             "src/base/ftwinfnt.c",
             "src/bdf/bdf.c",
@@ -37,13 +36,17 @@ project "freetype"
             "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" }
 
-    configuration "windows"
-        files { "builds/windows/ftdebug.c" }
-    configuration "not windows"
-        files { "src/base/ftdebug.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

@@ -13,8 +13,8 @@ BLOCK "080404b0"
 BEGIN
 VALUE "FileDescription", "YGOPro"
 VALUE "InternalName", "YGOPro"
-VALUE "LegalCopyright", "Copyright (C) 2021 Fluorohydride"
-VALUE "OriginalFilename", "ygopro.exe"
+VALUE "LegalCopyright", "Copyright (C) 2022 Fluorohydride"
+VALUE "OriginalFilename", "YGOPro.exe"
 VALUE "ProductName", "YGOPro"
 VALUE "FileVersion", "1.035.3"
 VALUE "ProductVersion", "1.035.3"

premake/lua/premake4.lua

-project "lua"
-    kind "StaticLib"
-
-    files { "*.c", "*.cpp", "*.h", "*.hpp" }
-    removefiles { "lua.c", "luac.c" }
-
-    configuration "vs*"	
-        buildoptions { "/TP" }
-
-    configuration "not vs*"	
-        buildoptions { "-x c++" }

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" }

premake4.lua

-solution "ygo"
-    location "build"
-    language "C++"
-    objdir "obj"
-
-    configurations { "Debug", "Release" }
-
-    configuration "windows"
-        defines { "WIN32", "_WIN32", "WINVER=0x0501" }
-
-    configuration "bsd"
-        defines { "LUA_USE_POSIX" }
-        includedirs { "/usr/local/include" }
-        libdirs { "/usr/local/lib" }
-
-    configuration "macosx"
-        defines { "LUA_USE_MACOSX" }
-        includedirs { "/usr/local/include/*" }
-        libdirs { "/usr/local/lib", "/usr/X11/lib" }
-        buildoptions { "-stdlib=libc++" }
-        links {"OpenGL.framework","Cocoa.framework","IOKit.framework"}
-
-    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", "vs*" }
-        flags { "StaticRuntime", "LinkTimeOptimization" }
-
-    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

@@ -33,7 +33,7 @@ solution "ygo"
     end
     if (os.ishost("windows") or os.getenv("USE_IRRKLANG")) and not os.getenv("NO_IRRKLANG") then
         USE_IRRKLANG = true
-        if os.getenv("irrklang_pro") then
+        if os.getenv("IRRKLANG_PRO") then
             IRRKLANG_PRO = true
         end
     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 单人模式