Skip to content

Commit

Permalink
Fix #926: liquid-dsp master 'modem' changed to 'modemcf' for Digital …
Browse files Browse the repository at this point in the history 
…modems, updates Windows liquid-dsp binaries to master

- Updated Windows bins dependencies to latest MSYS2
- Win32/64 bins liquid-dsp ref: 471f46660ddfab7e6713341324f473b7785da101
- Win32/64 bins using GCC 11.2 (MSYS2)
  • Loading branch information
@vsonnier
vsonnier committed Nov 12, 2021
1 parent 0248e5a commit 0831aa2
Show file tree
Hide file tree
Showing 38 changed files with 5,027 additions and 4,652 deletions.
Binary file modified external/liquid-dsp/gcc/32/libliquid.a
View file
Binary file not shown.
Binary file modified external/liquid-dsp/gcc/32/libliquid.dll
View file
Binary file not shown.
Binary file modified external/liquid-dsp/gcc/64/libliquid.a
View file
Binary file not shown.
Binary file modified external/liquid-dsp/gcc/64/libliquid.dll
View file
Binary file not shown.
323 changes: 267 additions & 56 deletions external/liquid-dsp/include/liquid/liquid.h
View file

Large diffs are not rendered by default.

18 changes: 14 additions & 4 deletions external/liquid-dsp/makefile.mingw32
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ filter_objects := \
filter_includes := \
src/filter/src/autocorr.c \
src/filter/src/dds.c \
src/filter/src/fdelay.c \
src/filter/src/fftfilt.c \
src/filter/src/firdecim.c \
src/filter/src/firfarrow.c \
Expand Down Expand Up @@ -485,6 +486,7 @@ src/filter/src/rrcos.o : %.o : %.c $(include_headers)


filter_autotests := \
src/filter/tests/fdelay_rrrf_autotest.c \
src/filter/tests/fftfilt_xxxf_autotest.c \
src/filter/tests/filter_crosscorr_autotest.c \
src/filter/tests/firdecim_xxxf_autotest.c \
Expand Down Expand Up @@ -665,10 +667,14 @@ framing_autotests := \
src/framing/tests/detector_autotest.c \
src/framing/tests/flexframesync_autotest.c \
src/framing/tests/framesync64_autotest.c \
src/framing/tests/gmskframe_autotest.c \
src/framing/tests/ofdmflexframe_autotest.c \
src/framing/tests/qdetector_cccf_autotest.c \
src/framing/tests/qpacketmodem_autotest.c \
src/framing/tests/qpilotsync_autotest.c \
src/framing/tests/symstreamcf_delay_autotest.c \
src/framing/tests/symstreamrcf_delay_autotest.c \
src/framing/tests/symtrack_cccf_autotest.c \


framing_benchmarks := \
Expand Down Expand Up @@ -822,7 +828,7 @@ modem_objects := \
src/modem/src/fskmod.o \
src/modem/src/gmskdem.o \
src/modem/src/gmskmod.o \
src/modem/src/modemf.o \
src/modem/src/modemcf.o \
src/modem/src/modem_utilities.o \
src/modem/src/modem_apsk_const.o \
src/modem/src/modem_arb_const.o \
Expand All @@ -846,7 +852,7 @@ modem_includes := \

#src/modem/src/modem_demod_soft_const.c

src/modem/src/modemf.o : %.o : %.c $(include_headers) $(modem_includes)
src/modem/src/modemcf.o : %.o : %.c $(include_headers) $(modem_includes)
src/modem/src/gmskmod.o : %.o : %.c $(include_headers)
src/modem/src/gmskdem.o : %.o : %.c $(include_headers)
src/modem/src/ampmodem.o : %.o : %.c $(include_headers)
Expand All @@ -864,6 +870,7 @@ modem_autotests := \
src/modem/tests/modem_autotest.c \
src/modem/tests/modem_demodsoft_autotest.c \
src/modem/tests/modem_demodstats_autotest.c \
src/modem/tests/modem_utilities_autotest.c \


modem_benchmarks := \
Expand Down Expand Up @@ -1343,7 +1350,7 @@ clean-check:
##

readme.c.example.c : README.md
${SED} -n '22,42p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@
${SED} -n '23,43p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@

readme.c.example.o : %.o : %.c ${include_headers}
${CC} ${CPPFLAGS} ${CFLAGS} $< -c -o $@
Expand All @@ -1352,7 +1359,7 @@ readme.c.example : % : %.o ${ARCHIVE_LIB}
${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LIBS}

readme.cc.example.cc : README.md
${SED} -n '151,172p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@
${SED} -n '152,173p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@

readme.cc.example.o : %.o : %.cc ${include_headers}
${CXX} ${CPPFLAGS} ${CXXFLAGS} $< -c -o $@
Expand Down Expand Up @@ -1488,6 +1495,7 @@ example_programs := \
examples/error_handling_example \
examples/fec_example \
examples/fec_soft_example \
examples/fdelay_rrrf_example \
examples/fft_example \
examples/fftfilt_crcf_example \
examples/firdecim_crcf_example \
Expand Down Expand Up @@ -1608,7 +1616,9 @@ example_programs := \
examples/symsync_crcf_example \
examples/symsync_crcf_full_example \
examples/symsync_crcf_kaiser_example \
examples/symstreamcf_delay_example \
examples/symstreamcf_example \
examples/symstreamrcf_delay_example \
examples/symstreamrcf_example \
examples/symtrack_cccf_example \
examples/wdelayf_example \
Expand Down
18 changes: 14 additions & 4 deletions external/liquid-dsp/makefile.mingw64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ filter_objects := \
filter_includes := \
src/filter/src/autocorr.c \
src/filter/src/dds.c \
src/filter/src/fdelay.c \
src/filter/src/fftfilt.c \
src/filter/src/firdecim.c \
src/filter/src/firfarrow.c \
Expand Down Expand Up @@ -485,6 +486,7 @@ src/filter/src/rrcos.o : %.o : %.c $(include_headers)


filter_autotests := \
src/filter/tests/fdelay_rrrf_autotest.c \
src/filter/tests/fftfilt_xxxf_autotest.c \
src/filter/tests/filter_crosscorr_autotest.c \
src/filter/tests/firdecim_xxxf_autotest.c \
Expand Down Expand Up @@ -665,10 +667,14 @@ framing_autotests := \
src/framing/tests/detector_autotest.c \
src/framing/tests/flexframesync_autotest.c \
src/framing/tests/framesync64_autotest.c \
src/framing/tests/gmskframe_autotest.c \
src/framing/tests/ofdmflexframe_autotest.c \
src/framing/tests/qdetector_cccf_autotest.c \
src/framing/tests/qpacketmodem_autotest.c \
src/framing/tests/qpilotsync_autotest.c \
src/framing/tests/symstreamcf_delay_autotest.c \
src/framing/tests/symstreamrcf_delay_autotest.c \
src/framing/tests/symtrack_cccf_autotest.c \


framing_benchmarks := \
Expand Down Expand Up @@ -822,7 +828,7 @@ modem_objects := \
src/modem/src/fskmod.o \
src/modem/src/gmskdem.o \
src/modem/src/gmskmod.o \
src/modem/src/modemf.o \
src/modem/src/modemcf.o \
src/modem/src/modem_utilities.o \
src/modem/src/modem_apsk_const.o \
src/modem/src/modem_arb_const.o \
Expand All @@ -846,7 +852,7 @@ modem_includes := \

#src/modem/src/modem_demod_soft_const.c

src/modem/src/modemf.o : %.o : %.c $(include_headers) $(modem_includes)
src/modem/src/modemcf.o : %.o : %.c $(include_headers) $(modem_includes)
src/modem/src/gmskmod.o : %.o : %.c $(include_headers)
src/modem/src/gmskdem.o : %.o : %.c $(include_headers)
src/modem/src/ampmodem.o : %.o : %.c $(include_headers)
Expand All @@ -864,6 +870,7 @@ modem_autotests := \
src/modem/tests/modem_autotest.c \
src/modem/tests/modem_demodsoft_autotest.c \
src/modem/tests/modem_demodstats_autotest.c \
src/modem/tests/modem_utilities_autotest.c \


modem_benchmarks := \
Expand Down Expand Up @@ -1343,7 +1350,7 @@ clean-check:
##

readme.c.example.c : README.md
${SED} -n '22,42p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@
${SED} -n '23,43p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@

readme.c.example.o : %.o : %.c ${include_headers}
${CC} ${CPPFLAGS} ${CFLAGS} $< -c -o $@
Expand All @@ -1352,7 +1359,7 @@ readme.c.example : % : %.o ${ARCHIVE_LIB}
${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LIBS}

readme.cc.example.cc : README.md
${SED} -n '151,172p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@
${SED} -n '152,173p' $< | ${SED} "s/<liquid\/liquid.h>/\"liquid.h\"/g" > $@

readme.cc.example.o : %.o : %.cc ${include_headers}
${CXX} ${CPPFLAGS} ${CXXFLAGS} $< -c -o $@
Expand Down Expand Up @@ -1488,6 +1495,7 @@ example_programs := \
examples/error_handling_example \
examples/fec_example \
examples/fec_soft_example \
examples/fdelay_rrrf_example \
examples/fft_example \
examples/fftfilt_crcf_example \
examples/firdecim_crcf_example \
Expand Down Expand Up @@ -1608,7 +1616,9 @@ example_programs := \
examples/symsync_crcf_example \
examples/symsync_crcf_full_example \
examples/symsync_crcf_kaiser_example \
examples/symstreamcf_delay_example \
examples/symstreamcf_example \
examples/symstreamrcf_delay_example \
examples/symstreamrcf_example \
examples/symtrack_cccf_example \
examples/wdelayf_example \
Expand Down
Loading

0 comments on commit 0831aa2

Please sign in to comment.