still headache

.gitlab-ci.yml

@@ -57,7 +57,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-alpha12-macosx.tar.gz | tar zfx -
+    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-alpha14-macosx.tar.gz | tar zfx -
     - mkdir irrlicht
     - cd irrlicht
     - wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
@@ -166,12 +166,13 @@ exec_macos:
   script:
     - git submodule update --init
     - brew install freetype libevent sqlite dylibbundler
-    - ./premake5 gmake
+    - sudo cp -rf irrklang/bin/macosx-gcc/libirrklang.dylib /usr/local/lib/
+    - ./premake5 gmake --cc=clang
     - cd build
     - make config=release -j4
     - cd ..
     - mkdir -p ygopro.app/Contents/MacOS;
-    - mv bin/release/ygopro ygopro.app/Contents/MacOS;
+    - mv bin/release/ygopro.app ygopro.app/Contents/MacOS/ygopro;
     - dylibbundler -x ygopro.app/Contents/MacOS/ygopro -b -d ygopro.app/Contents/Frameworks/ -p @executable_path/../Frameworks/ -cd;
     - strip ygopro.app/Contents/MacOS/ygopro; mkdir ygopro.app/Contents/Resources;
     - mv premake/gframe/ygopro.icns ygopro.app/Contents/Resources/Icon.icns;

gframe/premake4.lua

@@ -30,12 +30,12 @@ project "ygopro"
         end
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
     if IRRKLANG_PRO then
-        configuration { "windows", "not vs2017" }
+        configuration { "windows", "not vs2017", "not vs2019" }
             libdirs { "../irrklang/lib/Win32-visualStudio" }
         configuration { "windows", "vs2017" }
             libdirs { "../irrklang/lib/Win32-vs2017" }
         configuration { "windows", "vs2019" }
-            libdirs { "../irrklang/lib/Win32-vs2017" }
+            libdirs { "../irrklang/lib/Win32-vs2019" }
     end
     configuration {"windows", "not vs*"}
         includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }
@@ -44,7 +44,9 @@ project "ygopro"
     configuration "not windows"
         includedirs { "/usr/include/irrlicht", "/usr/include/freetype2" }
         excludes { "COSOperator.*" }
-        links { "event_pthreads", "GL", "dl", "pthread" }
+        links { "event_pthreads", "dl", "pthread" }
+    configuration { "not windows", "not macosx" }
+        links "GL"
     configuration "linux"
         includedirs { "../irrlicht_linux/include" }
         links { "X11", "Xxf86vm", "lua5.3-c++" }

premake5.lua

@@ -32,9 +32,9 @@ solution "ygo"
         libdirs { "/usr/local/lib" }
 
     configuration "macosx"
-        defines { "LUA_USE_MACOSX", "DBL_MAX_10_EXP=+308", "DBL_MANT_DIG=53"}
-        includedirs { "/usr/local/include", "/usr/local/include/*" }
-        libdirs { "/usr/local/lib", "/usr/X11/lib" }
+        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" }
+        libdirs { "/usr/local/lib" }
         buildoptions { "-stdlib=libc++" }
         links { "OpenGL.framework", "Cocoa.framework", "IOKit.framework" }