adding mingw64 binary

cagnulein · Jan 4, 2024 · e4e4952 · e4e4952
1 parent 9413349
commit e4e4952
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -110,16 +110,6 @@ jobs:
           cache: 'true'
           cache-key-prefix: 'install-qt-action-windows'          
 
-      - name: Download protobuf
-        run: |
-          Invoke-WebRequest -Uri "https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.zip" -OutFile "protobuf.zip"
-          Expand-Archive protobuf.zip -DestinationPath "protobuf"
-          cd protobuf/protobuf-25.1
-          Invoke-WebRequest -Uri "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.zip" -OutFile "abseil-cpp.zip"
-          Expand-Archive  abseil-cpp.zip -DestinationPath "abseil-temp"
-          cp abseil-temp/abseil-cpp-20230802.1/* third_party/abseil-cpp/                    
-          cmake -Dprotobuf_BUILD_TESTS=OFF CMakeLists.txt
-
       - name: download 3rd party files for qthttpserver
         run: |
             cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
@@ -427,6 +417,7 @@ jobs:
           unzip abseil-cpp.zip -d "abseil-temp"
           cp -a abseil-temp/abseil-cpp-20230802.1/* third_party/abseil-cpp/
           cmake -Dprotobuf_BUILD_TESTS=OFF CMakeLists.txt
+          ls -ltr
           cp *.so /home/runner/work/qdomyos-zwift/Qt/5.15.2/gcc_64/lib/
 
       - name: Install Qt

diff --git a/src/qdomyos-zwift.pri b/src/qdomyos-zwift.pri
@@ -30,7 +30,7 @@ CONFIG += qmltypes
 #win32: CONFIG += webengine
 #unix:!android: CONFIG += webengine
 
-win32:LIBS += -lprotoc -lprotobuf
+win32:LIBS += -lprotoc -lprotobuf -Lwindows/mingw64/
 unix:!android:LIBS += -lprotoc -lprotobuf
 
 QML_IMPORT_NAME = org.cagnulein.qdomyoszwift

diff --git a/src/windows/mingw64/libprotobuf-lite.a b/src/windows/mingw64/libprotobuf-lite.a
diff --git a/src/windows/mingw64/libprotobuf-lite.dll.a b/src/windows/mingw64/libprotobuf-lite.dll.a
diff --git a/src/windows/mingw64/libprotobuf.a b/src/windows/mingw64/libprotobuf.a
diff --git a/src/windows/mingw64/libprotobuf.dll.a b/src/windows/mingw64/libprotobuf.dll.a
diff --git a/src/windows/mingw64/libprotoc.a b/src/windows/mingw64/libprotoc.a
diff --git a/src/windows/mingw64/libprotoc.dll.a b/src/windows/mingw64/libprotoc.dll.a
diff --git a/src/windows/mingw64/libutf8_range.a b/src/windows/mingw64/libutf8_range.a
diff --git a/src/windows/mingw64/libutf8_validity.a b/src/windows/mingw64/libutf8_validity.a