Attach mingw libraries

lifs-tools · Feb 8, 2024 · c837034 · c837034
1 parent b87d936
commit c837034
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -80,7 +80,13 @@ jobs:
       uses: egor-tensin/[email protected]
       with:
         platform: x64
-        version: 12.2.0
+        version: 11.2.0
+    - name: Attach mingw to Build
+      uses: actions/upload-artifact@v4
+      # action zips automatically
+      with:
+        name: "mingw64"
+        path: "C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64"
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
@@ -119,7 +125,7 @@ jobs:
 
     - name: Build LipidSpace
       run: |
-        make
+        make -j8
 
     - name: Ensure that .\release\LipidSpaceGH.exe exists
       run: |

diff --git a/LipidSpaceGH.pro b/LipidSpaceGH.pro
@@ -30,7 +30,7 @@ unix {
 }
 
 win32 {
-    LIBS += -fopenmp $$PWD\libraries\cppgoslin\bin\win64\libcppGoslin.dll $$PWD\libraries\OpenBLAS\bin\win64\libopenblas.dll $$PWD\libraries\OpenXLSX\bin\win64\libOpenXLSX.dll
+    LIBS += -static-libstdc++ -fopenmp $$PWD\libraries\cppgoslin\bin\win64\libcppGoslin.dll $$PWD\libraries\OpenBLAS\bin\win64\libopenblas.dll $$PWD\libraries\OpenXLSX\bin\win64\libOpenXLSX.dll
 }
 
 macx {
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ unix { @@
     }
     win32 {
-        LIBS += -fopenmp $$PWD\libraries\cppgoslin\bin\win64\libcppGoslin.dll $$PWD\libraries\OpenBLAS\bin\win64\libopenblas.dll $$PWD\libraries\OpenXLSX\bin\win64\libOpenXLSX.dll
+        LIBS += -static-libstdc++ -fopenmp $$PWD\libraries\cppgoslin\bin\win64\libcppGoslin.dll $$PWD\libraries\OpenBLAS\bin\win64\libopenblas.dll $$PWD\libraries\OpenXLSX\bin\win64\libOpenXLSX.dll
     }
     macx {
@@ Expand Down @@