Merge pull request #413 from npwoods/fix_msys2_build

Fixing MSYS2 build - ran into a static Qt issue
npwoods · Jan 28, 2024 · 34c3c8b · 34c3c8b
2 parents 14f514d + 5a2a38e
commit 34c3c8b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/windows_msys2.yml b/.github/workflows/windows_msys2.yml
@@ -39,7 +39,7 @@ jobs:
         msystem: MINGW64
         update: false
         release: false
-        install: git parallel p7zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-polly mingw-w64-x86_64-mlir mingw-w64-x86_64-clang mingw-w64-x86_64-clang-analyzer mingw-w64-x86_64-clang-tools-extra mingw-w64-x86_64-qt6-static mingw-w64-x86_64-jasper mingw-w64-x86_64-graphite2 patch
+        install: git parallel p7zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-polly mingw-w64-x86_64-mlir mingw-w64-x86_64-clang mingw-w64-x86_64-clang-analyzer mingw-w64-x86_64-clang-tools-extra mingw-w64-x86_64-qt6-static mingw-w64-x86_64-jasper mingw-w64-x86_64-graphite2 mingw-w64-x86_64-pcre2 mingw-w64-x86_64-libpng mingw-w64-x86_64-harfbuzz patch
 
     # Cache Dependencies
     - name: Cache Dependencies

diff --git a/scripts/bletchmame_build_msys2.sh b/scripts/bletchmame_build_msys2.sh
@@ -40,6 +40,7 @@ cmake -S. -B${BLETCHMAME_BUILD_DIR}								\
 	-DUSE_PROFILER=${USE_PROFILER}								\
 	-DCMAKE_BUILD_TYPE=${BUILD_TYPE}							\
 	-DCMAKE_PREFIX_PATH="${DEPS_INSTALL_DIR};${QT_INSTALL_DIR}"	\
+	-DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE					\
 
 # generate version.gen.h
 mkdir -p ${BLETCHMAME_DIR}/include

diff --git a/scripts/validate_dllimports.pl b/scripts/validate_dllimports.pl
@@ -15,6 +15,7 @@
 	"authz.dll",
 	"comdlg32.dll",
 	"d3d11.dll",
+	"d3d12.dll",
 	"d3d9.dll",
 	"dcomp.dll",
 	"dwmapi.dll",
@@ -28,6 +29,7 @@
 	"ole32.dll",
 	"oleaut32.dll",
 	"rpcrt4.dll",
+	"setupapi.dll",
 	"shcore.dll",
 	"shell32.dll",
 	"shlwapi.dll",