Merge branch 'fh' into patch-build-all

.github/workflows/build.yml

@@ -429,9 +429,7 @@ jobs:
     - name: Use premake to generate make files (apt packages)
       if: matrix.static-link != true
       run: |
-        ./premake5 gmake \
-          --freetype-include-dir="/usr/include/freetype2" \
-          --opus-include-dir="/usr/include/opus"
+        ./premake5 gmake
 
     - name: Use premake to generate make files (static link)
       if: matrix.static-link == true
@@ -653,27 +651,24 @@ jobs:
         cp -r premake/* .
         cp -r resource/* .
 
-    - name: Use premake to generate make files (homebrew packages, Intel)
-      if: matrix.static-link != true && runner.arch == 'X64'
-      run: |
-        premake5 gmake ${{ matrix.cross-build-intel == true && '--mac-intel' || '' }} ${{ matrix.cross-build-arm == true && '--mac-arm' || '' }} \
-          --freetype-include-dir="/usr/local/include/freetype2" \
-          --opus-include-dir="/usr/local/include/opus"
-
-    - name: Use premake to generate make files (homebrew packages, Apple Silicon)
-      if: matrix.static-link != true && runner.arch == 'ARM64'
+    - name: Use premake to generate make files (Homebrew packages)
+      if: matrix.static-link != true
       run: |
         premake5 gmake ${{ matrix.cross-build-intel == true && '--mac-intel' || '' }} ${{ matrix.cross-build-arm == true && '--mac-arm' || '' }} \
-          --event-include-dir="/opt/homebrew/include" \
-          --event-lib-dir="/opt/homebrew/lib" \
-          --freetype-include-dir="/opt/homebrew/include/freetype2" \
-          --freetype-lib-dir="/opt/homebrew/lib" \
-          --sqlite-include-dir="/opt/homebrew/opt/sqlite/include" \
-          --sqlite-lib-dir="/opt/homebrew/opt/sqlite/lib" \
-          --opus-include-dir="/opt/homebrew/include/opus" \
-          --opus-lib-dir="/opt/homebrew/lib" \
-          --vorbis-include-dir="/opt/homebrew/include" \
-          --vorbis-lib-dir="/opt/homebrew/lib"
+          --event-include-dir="$(brew --prefix libevent)/include" \
+          --event-lib-dir="$(brew --prefix libevent)/lib" \
+          --freetype-include-dir="$(brew --prefix freetype)/include/freetype2" \
+          --freetype-lib-dir="$(brew --prefix freetype)/lib" \
+          --sqlite-include-dir="$(brew --prefix sqlite)/include" \
+          --sqlite-lib-dir="$(brew --prefix sqlite)/lib" \
+          --ogg-include-dir="$(brew --prefix libogg)/include" \
+          --ogg-lib-dir="$(brew --prefix libogg)/lib" \
+          --opus-include-dir="$(brew --prefix opus)/include/opus" \
+          --opus-lib-dir="$(brew --prefix opus)/lib" \
+          --opusfile-include-dir="$(brew --prefix opusfile)/include/opus" \
+          --opusfile-lib-dir="$(brew --prefix opusfile)/lib" \
+          --vorbis-include-dir="$(brew --prefix libvorbis)/include" \
+          --vorbis-lib-dir="$(brew --prefix libvorbis)/lib"
 
     - name: Use premake to generate make files (static link)
       if: matrix.static-link == true

gframe/game.cpp

@@ -1557,7 +1557,7 @@ void Game::ShowCardInfo(int code, bool resize) {
 		myswprintf(formatBuffer, L"%ls[%08d]", dataManager.GetName(code), code);
 	}
 	stName->setText(formatBuffer);
-	if(guiFont->getDimension(formatBuffer).Width > stName->getRelativePosition().getWidth() - gameConf.textfontsize)
+	if((int)guiFont->getDimension(formatBuffer).Width > stName->getRelativePosition().getWidth() - gameConf.textfontsize)
 		stName->setToolTipText(formatBuffer);
 	else
 		stName->setToolTipText(nullptr);

gframe/premake5.lua

@@ -50,7 +50,7 @@ project "YGOPro"
                 includedirs { "../miniaudio/extras/decoders/libopus", "../miniaudio/extras/decoders/libvorbis" }
                 if not MINIAUDIO_BUILD_OPUS_VORBIS then
                     links { "opusfile", "vorbisfile", "opus", "vorbis", "ogg" }
-                    libdirs { OPUS_LIB_DIR, VORBIS_LIB_DIR, OGG_LIBDIR }
+                    libdirs { OPUS_LIB_DIR, OPUSFILE_LIB_DIR, VORBIS_LIB_DIR, OGG_LIB_DIR }
                 end
             end
         end

premake/miniaudio/premake5.lua

@@ -132,7 +132,7 @@ project "miniaudio"
                 }
             end
         else
-            includedirs { OPUS_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
+            includedirs { OPUS_INCLUDE_DIR, OPUSFILE_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
         end
     end
 

premake5.lua

@@ -61,6 +61,8 @@ newoption { trigger = "build-opus-vorbis", category = "YGOPro - miniaudio", desc
 newoption { trigger = "no-build-opus-vorbis", category = "YGOPro - miniaudio", description = "" }
 newoption { trigger = "opus-include-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
 newoption { trigger = "opus-lib-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
+newoption { trigger = "opusfile-include-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
+newoption { trigger = "opusfile-lib-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
 newoption { trigger = "vorbis-include-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
 newoption { trigger = "vorbis-lib-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
 newoption { trigger = "ogg-include-dir", category = "YGOPro - miniaudio", description = "", value = "PATH" }
@@ -94,7 +96,7 @@ if not BUILD_LUA then
     -- at most times you need to change those if you change BUILD_LUA to false
     -- make sure your lua lib is built with C++ and version >= 5.3
     LUA_LIB_NAME = GetParam("lua-lib-name") or LUA_LIB_NAME
-    LUA_INCLUDE_DIR = GetParam("lua-include-dir") or os.findheader(LUA_LIB_NAME)
+    LUA_INCLUDE_DIR = GetParam("lua-include-dir") or os.findheader("lua.h")
     LUA_LIB_DIR = GetParam("lua-lib-dir") or os.findlib(LUA_LIB_NAME)
 end
 
@@ -104,7 +106,7 @@ elseif GetParam("no-build-event") then
     BUILD_EVENT = false
 end
 if not BUILD_EVENT then
-    EVENT_INCLUDE_DIR = GetParam("event-include-dir") or os.findheader("event")
+    EVENT_INCLUDE_DIR = GetParam("event-include-dir") or os.findheader("event2/event.h")
     EVENT_LIB_DIR = GetParam("event-lib-dir") or os.findlib("event")
 end
 
@@ -114,7 +116,7 @@ elseif GetParam("no-build-freetype") then
     BUILD_FREETYPE = false
 end
 if not BUILD_FREETYPE then
-    FREETYPE_INCLUDE_DIR = GetParam("freetype-include-dir") or os.findheader("freetype")
+    FREETYPE_INCLUDE_DIR = GetParam("freetype-include-dir") or os.findheader("freetype2/ft2build.h") .. "/freetype2"
     FREETYPE_LIB_DIR = GetParam("freetype-lib-dir") or os.findlib("freetype")
 end
 
@@ -124,7 +126,7 @@ elseif GetParam("no-build-sqlite") then
     BUILD_SQLITE = false
 end
 if not BUILD_SQLITE then
-    SQLITE_INCLUDE_DIR = GetParam("sqlite-include-dir") or os.findheader("sqlite3")
+    SQLITE_INCLUDE_DIR = GetParam("sqlite-include-dir") or os.findheader("sqlite3.h")
     SQLITE_LIB_DIR = GetParam("sqlite-lib-dir") or os.findlib("sqlite3")
 end
 
@@ -134,7 +136,7 @@ elseif GetParam("no-build-irrlicht") then
     BUILD_IRRLICHT = false
 end
 if not BUILD_IRRLICHT then
-    IRRLICHT_INCLUDE_DIR = GetParam("irrlicht-include-dir") or os.findheader("irrlicht")
+    IRRLICHT_INCLUDE_DIR = GetParam("irrlicht-include-dir") or os.findheader("irrlicht.h")
     IRRLICHT_LIB_DIR = GetParam("irrlicht-lib-dir") or os.findlib("irrlicht")
 end
 
@@ -171,12 +173,14 @@ if USE_AUDIO then
                 MINIAUDIO_BUILD_OPUS_VORBIS = true
             end
             if not MINIAUDIO_BUILD_OPUS_VORBIS then
-                OPUS_INCLUDE_DIR = GetParam("opus-include-dir") or os.findheader("opus")
-                OPUS_LIB_DIR = GetParam("opus-lib-dir") or os.findlib("opusfile")
-                VORBIS_INCLUDE_DIR = GetParam("vorbis-include-dir") or os.findheader("vorbis")
+                OPUS_INCLUDE_DIR = GetParam("opus-include-dir") or os.findheader("opus/opus.h") .. "/opus"
+                OPUS_LIB_DIR = GetParam("opus-lib-dir") or os.findlib("opus")
+                OPUSFILE_INCLUDE_DIR = GetParam("opusfile-include-dir") or os.findheader("opus/opusfile.h") .. "/opus"
+                OPUSFILE_LIB_DIR = GetParam("opusfile-lib-dir") or os.findlib("opusfile")
+                VORBIS_INCLUDE_DIR = GetParam("vorbis-include-dir") or os.findheader("vorbis/vorbisfile.h")
                 VORBIS_LIB_DIR = GetParam("vorbis-lib-dir") or os.findlib("vorbis")
-                OGG_INCLUDE_DIR = GetParam("ogg-include-dir") or os.findheader("ogg")
-                OCG_LIB_DIR = GetParam("ogg-lib-dir") or os.findlib("ogg")
+                OGG_INCLUDE_DIR = GetParam("ogg-include-dir") or os.findheader("ogg/ogg.h")
+                OGG_LIB_DIR = GetParam("ogg-lib-dir") or os.findlib("ogg")
             end
         end
     elseif AUDIO_LIB == "irrklang" then