Merge branch 'master' into server

.ci/pack-linux.sh

@@ -6,4 +6,4 @@ set -o errexit
 apt update && apt -y install tar git
 git submodule update --init
 mkdir dist replay
-tar -zcf dist/KoishiPro-$CI_COMMIT_REF_NAME-linux-$TARGET_LOCALE.tar.gz --exclude='.git*' ygopro LICENSE README.md libIrrKlang.so lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts
+tar -zcf dist/KoishiPro-$CI_COMMIT_REF_NAME-linux-$TARGET_LOCALE.tar.gz --exclude='.git*' ygopro LICENSE README.md lib lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts

.gitignore

@@ -63,6 +63,7 @@ build
 /update
 /update*
 /locales
+/lib
 
 # ygopro main program
 /ygopro

.gitlab-ci.yml

@@ -20,10 +20,15 @@ mat_common:
     # sqlite3
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/sqlite-autoconf-3360000.tar.gz | tar zfx -
     - mv sqlite-autoconf-3360000 sqlite3
+    # freetype
+    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/freetype-2.10.4.tar.gz | tar zfx -
+    - mv freetype-2.10.4 freetype
+    # premake
     - cp -rf premake/* .;
   artifacts:
     paths:
       - lua
+      - freetype
       - sqlite3
 
 mat_linux:
@@ -34,13 +39,13 @@ mat_linux:
     - apt update; apt -y install git wget tar
     #- git clone --depth=1 https://code.mycard.moe/mycard/irrlicht irrlicht_linux
     - 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/libevent-2.0.22-stable.tar.gz | tar zfx -
-    #- cd libevent-2.0.22-stable
-    #- ./configure --prefix=$PWD/libevent-stable --disable-openssl
-    #- make -j$(nproc)
-    #- make install
-    #- cd ..
-    #- mv libevent-2.0.22-stable/libevent-stable .
+    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+    - cd libevent-2.0.22-stable
+    - ./configure --prefix=$PWD/libevent-stable --disable-openssl
+    - make -j$(nproc)
+    - make install
+    - cd ..
+    - mv libevent-2.0.22-stable/libevent-stable .
   artifacts:
     paths:
       - premake5
@@ -63,7 +68,6 @@ mat_windows:
     paths:
       - premake5.exe
       - event
-      - sqlite3
 
 exec_windows:
   stage: build
@@ -95,8 +99,8 @@ exec_linux:
     - linux
   variables:
     YGOPRO_BUILD_ALL: '1'
-    #YGOPRO_LINUX_ALL_STATIC: '1'
-    #YGOPRO_LINUX_ALL_STATIC_LIB_PATH: '/usr/lib/x86_64-linux-gnu/'
+    YGOPRO_LINUX_ALL_STATIC: '1'
+    YGOPRO_LINUX_ALL_STATIC_LIB_PATH: '/usr/lib/x86_64-linux-gnu/'
   dependencies:
     - mat_common
     #- mat_irrklang

gframe/premake4.lua

@@ -3,6 +3,7 @@ include "lzma/."
 project "ygopro"
     kind "ConsoleApp"
 
+<<<<<<< HEAD
     local params={
         "DEFAULT_DUEL_RULE",
         "DECKCOUNT_MAIN_MIN",
@@ -15,8 +16,31 @@ project "ygopro"
     for _,param in ipairs(params) do
         local val=os.getenv("YGOPRO_"..param)
         if val and tonumber(val) then defines { param.."="..tonumber(val) } end
+=======
+    files { "**.cpp", "**.cc", "**.c", "**.h" }
+    excludes { "lzma/**", "spmemvfs/**" }
+    includedirs { "../ocgcore" }
+    links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "sqlite3", "freetype" }
+    if not LINUX_ALL_STATIC then
+        links { "event" }
+    end
+    if USE_IRRKLANG then
+        defines { "YGOPRO_USE_IRRKLANG" }
+        links { "ikpmp3" }
+        includedirs { "../irrklang/include" }
+        if IRRKLANG_PRO then
+            defines { "IRRKLANG_STATIC" }
+        end
+    end
+    if os.getenv("YGOPRO_COMPAT_MYCARD") then
+        defines { "YGOPRO_COMPAT_MYCARD" }
+    end
+    if os.getenv("YGOPRO_MESSAGE_DEBUG") then
+        defines { "YGOPRO_MESSAGE_DEBUG" }
+>>>>>>> master
     end
 
+<<<<<<< HEAD
     files { "gframe.cpp", "config.h",
             "game.cpp", "game.h", "myfilesystem.h",
             "deck_manager.cpp", "deck_manager.h",
@@ -28,6 +52,12 @@ project "ygopro"
     includedirs { "../ocgcore" }
     links { "ocgcore", "clzma", "sqlite3" }
 
+=======
+    configuration "not linux"
+        if LINUX_ALL_STATIC then
+            links { "event" }
+        end
+>>>>>>> master
     configuration "windows"
         files "ygopro.rc"
         includedirs { "../event/include", "../sqlite3" }
@@ -42,6 +72,17 @@ project "ygopro"
         if BUILD_SQLITE then
             includedirs { "../sqlite3" }
         end
+<<<<<<< HEAD
+=======
+        if BUILD_FREETYPE then
+            includedirs {"../freetype/include" }
+        end
+    configuration { "not windows", "not macosx" }
+        links "GL"
+    configuration "linux"
+        linkoptions { "-static-libstdc++", "-static-libgcc", "-Wl,-rpath=./lib/" }
+        includedirs { "../irrlicht_linux/include" }
+>>>>>>> master
         if BUILD_LUA then
             links { "lua" }
         else
@@ -58,4 +99,4 @@ project "ygopro"
             links { "event" }
         end
     configuration "linux"
-        linkoptions { "-static-libstdc++", "-static-libgcc" }
+        linkoptions { "-static-libstdc++", "-static-libgcc", "-Wl,-rpath=./lib/" }

premake/freetype/premake4.lua

@@ -45,3 +45,5 @@ project "freetype"
 
     configuration "windows"
         files { "builds/windows/ftdebug.c" }
+    configuration "not windows"
+        files { "src/base/ftdebug.c" }

premake5.lua

@@ -12,9 +12,9 @@ solution "ygo"
         if os.getenv("YGOPRO_BUILD_SQLITE") then
             BUILD_SQLITE=true
         end
-        --[[if os.getenv("YGOPRO_BUILD_FREETYPE") then
+        if os.getenv("YGOPRO_BUILD_FREETYPE") then
             BUILD_FREETYPE=true
-        end]]
+        end
         if os.getenv("YGOPRO_BUILD_ALL") or os.ishost("macosx") then
             BUILD_ALL=true
         end
@@ -27,7 +27,7 @@ solution "ygo"
         if BUILD_ALL then
             BUILD_LUA=true
             BUILD_SQLITE=true
-            --BUILD_FREETYPE=true
+            BUILD_FREETYPE=true
         end
     end
 
@@ -59,7 +59,7 @@ end
 
     configuration "macosx"
         defines { "LUA_USE_MACOSX", "DBL_MAX_10_EXP=+308", "DBL_MANT_DIG=53", "GL_SILENCE_DEPRECATION" }
-        includedirs { "/usr/local/include/event2", "/usr/local/include/freetype2" }
+        includedirs { "/usr/local/include/event2", }
         libdirs { "/usr/local/lib" }
         buildoptions { "-stdlib=libc++" }
         links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }