wtf fix 2

.gitlab-ci.yml

@@ -141,8 +141,12 @@ exec_windows:
     - mat_irrklang
     - mat_windows
   variables:
+    YGOPRO_BUILD_LUA: '1'
+    YGOPRO_BUILD_SQLITE: '1'
+    YGOPRO_BUILD_FREETYPE: '1'
+    YGOPRO_BUILD_IRRLICHT: '1'
     IRRKLANG_PRO: '1'
-    USE_IRRKLANG: "1"
+    USE_IRRKLANG: '1'
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
@@ -163,8 +167,11 @@ exec_linux:
   tags:
     - linux
   variables:
-    YGOPRO_BUILD_ALL: '1'
-    USE_IRRKLANG: "1"
+    YGOPRO_BUILD_LUA: '1'
+    YGOPRO_BUILD_SQLITE: '1'
+    YGOPRO_BUILD_FREETYPE: '1'
+    YGOPRO_BUILD_IRRLICHT: '1'
+    USE_IRRKLANG: '1'
   dependencies:
     - mat_common
     - mat_irrklang
@@ -200,7 +207,10 @@ exec_macos_platform_x86:
     - mat_common
     - mat_macos_platform_x86
   variables:
-    USE_IRRKLANG: "1"
+    YGOPRO_BUILD_LUA: '1'
+    YGOPRO_BUILD_SQLITE: '1'
+    YGOPRO_BUILD_FREETYPE: '1'
+    USE_IRRKLANG: '1'
     TARGET_PATFORM: x86
   cache:
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
@@ -223,6 +233,9 @@ exec_macos_platform_m1:
     - mat_common
     - mat_macos_platform_m1
   variables:
+    YGOPRO_BUILD_LUA: '1'
+    YGOPRO_BUILD_SQLITE: '1'
+    YGOPRO_BUILD_FREETYPE: '1'
     TARGET_PATFORM: m1
     YGOPRO_TARGET_ARM: '1'
   cache:

premake5.lua

@@ -2,36 +2,30 @@ solution "ygo"
     location "build"
     language "C++"
     objdir "obj"
-    if not os.ishost("windows") then
-        if os.getenv("YGOPRO_BUILD_LUA") then
-            BUILD_LUA=true
-        end
-        if os.getenv("YGOPRO_BUILD_SQLITE") then
-            BUILD_SQLITE=true
-        end
-        if os.getenv("YGOPRO_BUILD_FREETYPE") then
-            BUILD_FREETYPE=true
-        end
-        if os.getenv("YGOPRO_BUILD_ALL") or os.ishost("macosx") then
-            BUILD_ALL=true
-        end
-        if os.getenv("YGOPRO_LIBEVENT_STATIC_PATH") then
-            LIBEVENT_ROOT=os.getenv("YGOPRO_LIBEVENT_STATIC_PATH")
-        end
-        if BUILD_ALL then
-            BUILD_LUA=true
-            BUILD_SQLITE=true
-            BUILD_FREETYPE=true
-        end
-        if os.ishost("macosx") then
-            if os.getenv("YGOPRO_TARGET_ARM") then
-                MAC_ARM=true
-            end
+    if os.getenv("YGOPRO_BUILD_LUA") then
+        BUILD_LUA=true
+    end
+    if os.getenv("YGOPRO_BUILD_SQLITE") then
+        BUILD_SQLITE=true
+    end
+    if os.getenv("YGOPRO_BUILD_FREETYPE") then
+        BUILD_FREETYPE=true
+    end
+    if os.getenv("YGOPRO_BUILD_IRRLICHT") then
+        BUILD_IRRLICHT=true
+    end
+    if os.getenv("YGOPRO_LIBEVENT_STATIC_PATH") then
+        LIBEVENT_ROOT=os.getenv("YGOPRO_LIBEVENT_STATIC_PATH")
+    end
+    if os.ishost("macosx") then
+        if os.getenv("YGOPRO_TARGET_ARM") then
+            MAC_ARM=true
         end
-    else
-        BUILD_LUA=true -- tell ocgcore to include ../lua directory
     end
-    if (os.ishost("windows") or os.getenv("USE_IRRKLANG")) and not os.getenv("NO_IRRKLANG") then
+    if os.ishost("windows") then
+        BUILD_EVENT=true -- only on windows for now
+    end
+    if os.getenv("USE_IRRKLANG") and not os.getenv("NO_IRRKLANG") then
         USE_IRRKLANG = true
         if os.getenv("IRRKLANG_PRO") then
             IRRKLANG_PRO = true
@@ -122,25 +116,21 @@ end
 
     include "ocgcore"
     include "gframe"
-    if os.ishost("windows") then
+    if BUILD_LUA then
         include "lua"
+    end
+    if BUILD_EVENT then
         include "event"
+    end
+    if BUILD_FREETYPE then
         include "freetype"
-        include "sqlite3"
-    else
-        if BUILD_LUA then
-            include "lua"
-        end
-        if BUILD_SQLITE then
-            include "sqlite3"
-        end
-        if BUILD_FREETYPE then
-            include "freetype"
-        end
     end
-    if not os.ishost("macosx") then
+    if BUILD_IRRLICHT then
         include "irrlicht"
     end
+    if BUILD_SQLITE then
+        include "sqlite3"
+    end
     if USE_IRRKLANG then
         include "ikpmp3"
     end