ci

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

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -196,7 +196,7 @@ jobs:
         env:
           PKG_CONFIG_PATH: 'C:/msys64/mingw64/lib/pkgconfig'
         run: |
-          $env:PATH += ";C:/msys64/mingw64/bin"
+          $env:PATH = "C:/msys64/mingw64/bin;" + $env:PATH
           qmake
           mingw32-make.exe qmake_all
           mingw32-make.exe

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