new premake

.gitlab-ci.yml

@@ -52,13 +52,13 @@ mat_linux:
     - linux
   script:
     - apt update; apt -y install git wget tar
-    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht irrlicht_linux
+    - 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 -
     - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
   artifacts:
     paths:
       - premake5
-      - irrlicht_linux
+      - irrlicht
       - libevent-stable
 
 mat_macos_platform_x86:
@@ -125,11 +125,7 @@ mat_windows:
     - 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
     # irrlicht
-    - wget https://cdn01.moecube.com/ygopro-build-materials/irrlicht-1.8.4.zip
-    - 7z x -y irrlicht-1.8.4.zip
-    - mv premake/irrlicht .
-    - mv irrlicht-1.8.4/source/Irrlicht irrlicht/src
-    - mv irrlicht-1.8.4/include irrlicht/include
+    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
   artifacts:
     paths:
       - premake5.exe

gframe/premake4.lua

@@ -6,7 +6,7 @@ project "ygopro"
 
     files { "**.cpp", "**.cc", "**.c", "**.h" }
     excludes { "lzma/**", "spmemvfs/**" }
-    includedirs { "../ocgcore" }
+    includedirs { "../ocgcore", "../irrlicht/include" }
     links { "ocgcore", "clzma", "cspmemvfs", "Irrlicht", "sqlite3", "freetype", "event" }
     if USE_IRRKLANG then
         defines { "YGOPRO_USE_IRRKLANG" }
@@ -20,7 +20,7 @@ project "ygopro"
     configuration "windows"
         files "ygopro.rc"
         excludes "CGUIButton.cpp"
-        includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
+        includedirs { "../freetype/include", "../event/include", "../sqlite3" }
         links { "lua" }
         if USE_IRRKLANG then
             links { "irrKlang" }
@@ -61,7 +61,6 @@ project "ygopro"
         links "GL"
     configuration "linux"
         linkoptions { "-static-libstdc++", "-static-libgcc", "-Wl,-rpath=./lib/" }
-        includedirs { "../irrlicht_linux/include" }
         if BUILD_LUA then
             links { "lua" }
         else
@@ -74,7 +73,6 @@ project "ygopro"
         end
     configuration "macosx"
         links { "lua" }
-        includedirs { "../irrlicht/include" }
         libdirs { "../irrlicht" }
         if MAC_ARM then
             buildoptions { "--target=arm64-apple-macos11" }

premake5.lua

@@ -124,7 +124,6 @@ end
         include "lua"
         include "event"
         include "freetype"
-        include "irrlicht"
         include "sqlite3"
     else
         if BUILD_LUA then
@@ -137,8 +136,8 @@ end
             include "freetype"
         end
     end
-    if os.ishost("linux") then
-        include "irrlicht_linux"
+    if not os.ishost("macosx") then
+        include "irrlicht"
     end
     if USE_IRRKLANG then
         include "ikpmp3"

script @ ef32ed0d

-Subproject commit 3a75e12cda3ae09e6ff1272029c00b3bfb0db3e4
+Subproject commit ef32ed0d101ae56101c1fb4d13f66b72cc485fe8