ci test

kaniol-lck · Jun 12, 2024 · adbd698 · adbd698
1 parent 8aabd04
commit adbd698
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -191,9 +191,10 @@ jobs:
           Get-Command -Name 'mingw32-make' | Format-List
       - name: mingw-build
         id: build
-        shell: bash
+        shell: pwsh
         run: |
-          export PKG_CONFIG_PATH='C:/msys64/mingw64/lib/pkgconfig'
+          set PKG_CONFIG_PATH='C:/msys64/mingw64/lib/pkgconfig'
+          set PATH="%PATH%;C:/msys64/mingw64/bin"
           qmake
           mingw32-make.exe qmake_all
           mingw32-make.exe

diff --git a/.gitignore b/.gitignore
@@ -71,3 +71,5 @@ Thumbs.db
 *.dll
 *.exe
 
+#Builds
+build/
diff --git a/modmanager.pro b/modmanager.pro
@@ -421,11 +421,13 @@ unix {
     INCLUDEPATH += /usr/include/KF5/KWindowSystem
   }
   message($$system(printenv PKG_CONFIG_PATH))
-  message($$system($$pkgConfigExecutable() --libs libaria2))
-  LIBS += -L/usr/lib/x86_64-linux-gnu -L/usr/local/lib
-  CONFIG += link_pkgconfig
-  equals(QT_MAJOR_VERSION, 5): PKGCONFIG += libaria2 quazip1-qt5
-  equals(QT_MAJOR_VERSION, 6): PKGCONFIG += libaria2 quazip1-qt6
+  message($$system($$pkgConfigExecutable() --libs libaria2 quazip1-qt5))
+  message($$system($$pkgConfigExecutable() --cflags libaria2 quazip1-qt5))
+  QMAKE_CXXFLAGS += $$system($$pkgConfigExecutable() --cflags libaria2 quazip1-qt5)
+  LIBS += -L/usr/lib/x86_64-linux-gnu -lquazip5 -L/usr/local/lib -laria2
+  # CONFIG += link_pkgconfig
+  # equals(QT_MAJOR_VERSION, 5): PKGCONFIG += libaria2 quazip1-qt5
+  # equals(QT_MAJOR_VERSION, 6): PKGCONFIG += libaria2 quazip1-qt6
 }
 
 win32 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,3 +71,5 @@ Thumbs.db @@
     *.dll
     *.exe
+    #Builds
+    build/