freetype

.gitlab-ci.yml

@@ -21,13 +21,14 @@ mat_common:
     - 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.1.tar.gz | tar zfx -
-    - mv freetype-2.10.1 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:
@@ -106,8 +107,6 @@ mat_windows:
     paths:
       - premake5.exe
       - event
-      - freetype
-      - sqlite3
       - irrlicht
 
 exec_windows:
@@ -181,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

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

@@ -30,9 +30,7 @@ solution "ygo"
         if BUILD_ALL then
             BUILD_LUA=true
             BUILD_SQLITE=true
-            if not os.ishost("macosx") then
-                BUILD_FREETYPE=true
-            end
+            BUILD_FREETYPE=true
         end
     end
 
@@ -68,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" }