ci

kaniol-lck · Jun 13, 2024 · f022323 · f022323
1 parent dda8654
commit f022323
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -172,6 +172,7 @@ jobs:
           C:/msys64/usr/bin/pacman -S mingw-w64-${{ matrix.msys_arch }}-aria2 --noconfirm
           C:/msys64/usr/bin/pacman -S mingw-w64-${{ matrix.msys_arch }}-quazip-qt5 --noconfirm
           C:/msys64/usr/bin/pacman -S mingw-w64-${{ matrix.msys_arch }}-pkg-config --noconfirm
+          C:/msys64/usr/bin/pacman -Q
       - name: Install dependencies for Qt 6
         if: ${{ startsWith( matrix.qt_ver, 6 ) }}
         shell: powershell

diff --git a/modmanager.pro b/modmanager.pro
@@ -435,15 +435,16 @@ win32 {
   LIBS += -ldwmapi
 
   message($$system(printenv PKG_CONFIG_PATH))
-  message($$system($$pkgConfigExecutable() --cflags libaria2))
-  QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --cflags libaria2)
-  LIBS += $$system($$pkgConfigExecutable() --libs libaria2 | sed 's/\/lib\b/\/bin/' | sed 's/-laria2/-laria2-0/')
+  message($$system($$pkgConfigExecutable() --define-prefix --cflags libaria2))
+  message($$system($$pkgConfigExecutable() --define-prefix --libs libaria2))
+  QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --define-prefix --cflags libaria2)
+  LIBS += $$system($$pkgConfigExecutable() --define-prefix --libs libaria2 | sed 's/\/lib\b/\/bin/' | sed 's/-laria2/-laria2-0/')
   equals(QT_MAJOR_VERSION, 5){
-    QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --cflags quazip1-qt5)
-    LIBS += $$system($$pkgConfigExecutable() --libs quazip1-qt5)
+    QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --define-prefix --cflags quazip1-qt5)
+    LIBS += $$system($$pkgConfigExecutable() --define-prefix --libs quazip1-qt5)
   }
   equals(QT_MAJOR_VERSION, 6){
-    QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --cflags quazip1-qt6)
-    LIBS += $$system($$pkgConfigExecutable() --libs quazip1-qt6)
+    QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --define-prefix --cflags quazip1-qt6)
+    LIBS += $$system($$pkgConfigExecutable() --define-prefix --libs quazip1-qt6)
   }
 }