Merge remote-tracking branch 'upstream/fix-win-build' into bump-macos…

…-versions
gqrx-sdr · Oct 16, 2024 · 17a09ca · 17a09ca
2 parents 318ba12 + 2126406
commit 17a09ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -237,7 +237,7 @@ jobs:
     - name: Clone and build GNU Radio
       working-directory: ${{ runner.temp }}
       run: |
-        git clone --branch v3.10.9.2 --depth 1 https://github.com/gnuradio/gnuradio.git
+        git clone --branch v3.10.11.0 --depth 1 https://github.com/gnuradio/gnuradio.git
         cd gnuradio
         cmake -S . -B build \
           -DCMAKE_INSTALL_PREFIX=${RUNNER_TEMP}/msys64/mingw64 \
@@ -337,7 +337,7 @@ jobs:
           libfftw3f-3.dll \
           libfftw3f_threads-3.dll \
           libFLAC.dll \
-          libfmt.dll \
+          libfmt-11.dll \
           libfreetype-6.dll \
           libgcc_s_seh-1.dll \
           libglib-2.0-0.dll \

diff --git a/src/dsp/rx_rds.h b/src/dsp/rx_rds.h
@@ -35,7 +35,6 @@
 #include <gnuradio/analog/agc_cc.h>
 #include <gnuradio/blocks/keep_one_in_n.h>
 #include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/blocks/message_debug.h>
 #include <gnuradio/digital/constellation_receiver_cb.h>
 #include <gnuradio/digital/diff_decoder_bb.h>
 #include <gnuradio/digital/symbol_sync_cc.h>