Merge branch 'static-dir'

.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_irrklang:
@@ -92,9 +97,6 @@ mat_windows:
     # 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
-    # freetype
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/freetype-2.10.1.tar.gz | tar zfx -
-    - mv freetype-2.10.1 freetype
     # irrlicht
     - wget https://cdn01.moecube.com/ygopro-build-materials/irrlicht-1.8.4.zip
     - 7z x -y irrlicht-1.8.4.zip
@@ -105,8 +107,6 @@ mat_windows:
     paths:
       - premake5.exe
       - event
-      - freetype
-      - sqlite3
       - irrlicht
 
 exec_windows:
@@ -153,17 +153,18 @@ exec_linux:
   script:
     - apt update; apt -y install git build-essential libfreetype6-dev libgl1-mesa-dev libglu-dev libxxf86vm-dev
     - git submodule update --init
-    - env YGOPRO_LINUX_ALL_STATIC_LIBEVENT_PATH=$PWD/libevent-stable ./premake5 gmake
+    - mkdir lib
+    - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so ./lib/
+    - ./premake5 gmake
     - cd build
     - make config=release -j$(nproc)
     - cd ..
     - mv bin/release/ygopro .
     - strip ygopro
-    - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so .
   artifacts:
     paths:
       - ygopro
-      - libIrrKlang.so
+      - lib
 
 exec_macos:
   stage: build
@@ -179,7 +180,7 @@ exec_macos:
       - obj/
   script:
     - git submodule update --init
-    - brew install freetype libevent dylibbundler
+    - brew install libevent dylibbundler
     - sudo cp -rf irrklang/bin/macosx-gcc/libirrklang.dylib /usr/local/lib/
     #- sudo cp -rf irrklang/include /usr/local/include/irrklang
     - ./premake5 gmake --cc=clang

gframe/premake4.lua

@@ -7,9 +7,9 @@ project "ygopro"
     files { "**.cpp", "**.cc", "**.c", "**.h" }
     excludes { "lzma/**", "spmemvfs/**" }
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "sqlite3" }
+    links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "sqlite3", "freetype" }
     if not LINUX_ALL_STATIC then
-        links { "freetype", "event" }
+        links { "event" }
     end
     if USE_IRRKLANG then
         defines { "YGOPRO_USE_IRRKLANG" }
@@ -30,7 +30,7 @@ project "ygopro"
 
     configuration "not linux"
         if LINUX_ALL_STATIC then
-            links { "freetype", "event" }
+            links { "event" }
         end
     configuration "windows"
         files "ygopro.rc"
@@ -67,12 +67,12 @@ project "ygopro"
             includedirs { "../sqlite3" }
         end
         if BUILD_FREETYPE then
-            --includedirs {"../freetype/include" }
+            includedirs {"../freetype/include" }
         end
     configuration { "not windows", "not macosx" }
         links "GL"
     configuration "linux"
-        linkoptions { "-static-libstdc++", "-static-libgcc" }
+        linkoptions { "-static-libstdc++", "-static-libgcc", "-Wl,-rpath=./lib/" }
         includedirs { "../irrlicht_linux/include" }
         if BUILD_LUA then
             links { "lua" }
@@ -81,7 +81,6 @@ project "ygopro"
         end
         links { "X11", "Xxf86vm" }
         if LINUX_ALL_STATIC then
-            linkoptions { LIB_ROOT.."libfreetype.a" }
             local libeventRootPrefix=LIB_ROOT
             if LIBEVENT_ROOT then
                 includedirs { LIBEVENT_ROOT.."/include" }
@@ -91,7 +90,6 @@ project "ygopro"
         end
         if USE_IRRKLANG then
             links { "IrrKlang" }
-            linkoptions{ "-Wl,-rpath=./" }
             libdirs { "../irrklang/bin/linux-gcc-64" }
         end
     configuration "macosx"

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

@@ -15,9 +15,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
@@ -30,7 +30,7 @@ solution "ygo"
         if BUILD_ALL then
             BUILD_LUA=true
             BUILD_SQLITE=true
-            --BUILD_FREETYPE=true
+            BUILD_FREETYPE=true
         end
     end
 
@@ -66,7 +66,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" }
@@ -125,7 +125,7 @@ end
             include "sqlite3/premake4.lua"
         end
         if BUILD_FREETYPE then
-            --include "freetype"
+            include "freetype"
         end
     end
     if os.ishost("linux") then