Skip to content

Commit

Permalink
Update Windows libraries to liquid-dsp v1.32 / Gcc 9.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vsonnier committed Aug 17, 2019
1 parent 21fc2d6 commit e0d1e2b
Show file tree
Hide file tree
Showing 16 changed files with 3,683 additions and 3,501 deletions.
55 changes: 46 additions & 9 deletions external/liquid-dsp/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,30 @@
/* Support AVX (Advanced Vector Extensions) instructions */
#define HAVE_AVX 1

/* Define to 1 if you have the `cargf' function. */
#define HAVE_CARGF 1

/* Define to 1 if you have the `cexpf' function. */
#define HAVE_CEXPF 1

/* Define to 1 if you have the `cimagf' function. */
#define HAVE_CIMAGF 1

/* Define to 1 if you have the <complex.h> header file. */
#define HAVE_COMPLEX_H 1

/* Define to 1 if you have the `cosf' function. */
#define HAVE_COSF 1

/* Define to 1 if you have the `crealf' function. */
#define HAVE_CREALF 1

/* Define to 1 if you have the <emmintrin.h> header file. */
#define HAVE_EMMINTRIN_H 1

/* Define to 1 if you have the `expf' function. */
#define HAVE_EXPF 1

/* Define to 1 if you have the <fec.h> header file. */
/* #undef HAVE_FEC_H */

Expand All @@ -24,6 +42,9 @@
/* Define to 1 if you have the <float.h> header file. */
#define HAVE_FLOAT_H 1

/* Define to 1 if you have the `free' function. */
#define HAVE_FREE 1

/* Define to 1 if you have the <getopt.h> header file. */
#define HAVE_GETOPT_H 1

Expand All @@ -48,13 +69,18 @@
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1

/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
/* Define to 1 if you have the `malloc' function. */
#define HAVE_MALLOC 1

/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1

/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1

/* Define to 1 if you have the `memset' function. */
#define HAVE_MEMSET 1

/* Define to 1 if you have the <mmintrin.h> header file. */
#define HAVE_MMINTRIN_H 1

Expand All @@ -64,13 +90,18 @@
/* Define to 1 if you have the <pmmintrin.h> header file. */
#define HAVE_PMMINTRIN_H 1

/* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */
/* Define to 1 if you have the `realloc' function. */
#define HAVE_REALLOC 1

/* Define to 1 if you have the `sinf' function. */
#define HAVE_SINF 1

/* Define to 1 if you have the <smmintrin.h> header file. */
#define HAVE_SMMINTRIN_H 1

/* Define to 1 if you have the `sqrtf' function. */
#define HAVE_SQRTF 1

/* Support SSE (Streaming SIMD Extensions) instructions */
#define HAVE_SSE 1

Expand Down Expand Up @@ -129,13 +160,13 @@
/* #undef LIQUID_SIMDOVERRIDE */

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "support@liquidsdr.org"
#define PACKAGE_BUGREPORT "joseph@liquidsdr.org"

/* Define to the full name of this package. */
#define PACKAGE_NAME "liquid-dsp"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "liquid-dsp 1.3.1"
#define PACKAGE_STRING "liquid-dsp 1.3.2"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "liquid-dsp"
Expand All @@ -144,13 +175,19 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "1.3.1"
#define PACKAGE_VERSION "1.3.2"

/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4

/* The size of `unsigned int', as computed by sizeof. */
#define SIZEOF_UNSIGNED_INT 4
/* The size of `long int', as computed by sizeof. */
#define SIZEOF_LONG_INT 8

/* The size of `long long int', as computed by sizeof. */
#define SIZEOF_LONG_LONG_INT 8

/* The size of `short int', as computed by sizeof. */
#define SIZEOF_SHORT_INT 2

/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
Expand Down
Binary file modified external/liquid-dsp/gcc/32/libliquid.a
Binary file not shown.
Binary file modified external/liquid-dsp/gcc/32/libliquid.dll
Binary file not shown.
Binary file modified external/liquid-dsp/gcc/64/libliquid.a
Binary file not shown.
Binary file modified external/liquid-dsp/gcc/64/libliquid.dll
Binary file not shown.
155 changes: 130 additions & 25 deletions external/liquid-dsp/include/liquid/liquid.h

Large diffs are not rendered by default.

40 changes: 17 additions & 23 deletions external/liquid-dsp/makefile.mingw32
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
# bench : build and run benchmarking program
# examples : build all examples
# sandbox : build all sandbox examples
# programs : build all programs, but don't run anything
# world : build absolutely everything (but don't install)
#
# clean-modules : clean all modules
Expand All @@ -42,8 +43,8 @@

# autoconf initialization macros
NAME := liquid-dsp
VERSION := 1.3.1
BUGREPORT := support@liquidsdr.org
VERSION := 1.3.2
BUGREPORT := joseph@liquidsdr.org

# paths
srcdir := .
Expand All @@ -64,8 +65,8 @@ RANLIB := ranlib

# flags
INCLUDE_CFLAGS = $(addprefix -I,$(include_dirs))
#MINGW: optimizations goes here
CONFIG_CFLAGS = -m32 -O3 -msse3 -ffast-math
#MINGW: optimizations goes here, use SSSE42 for 32bit
CONFIG_CFLAGS = -m32 -O3 -msse4.2 -ffast-math
CPPFLAGS = $(INCLUDE_CFLAGS)
CFLAGS = $(CONFIG_CFLAGS) -Wall -fPIC
LDFLAGS =
Expand Down Expand Up @@ -482,6 +483,7 @@ filter_autotests := \
src/filter/tests/firdecim_xxxf_autotest.c \
src/filter/tests/firdes_autotest.c \
src/filter/tests/firdespm_autotest.c \
src/filter/tests/firfilt_cccf_notch_autotest.c \
src/filter/tests/firfilt_xxxf_autotest.c \
src/filter/tests/firhilb_autotest.c \
src/filter/tests/firinterp_autotest.c \
Expand All @@ -490,6 +492,7 @@ filter_autotests := \
src/filter/tests/iirdes_autotest.c \
src/filter/tests/iirfilt_xxxf_autotest.c \
src/filter/tests/iirfiltsos_rrrf_autotest.c \
src/filter/tests/lpc_autotest.c \
src/filter/tests/msresamp_crcf_autotest.c \
src/filter/tests/rresamp_crcf_autotest.c \
src/filter/tests/resamp_crcf_autotest.c \
Expand Down Expand Up @@ -634,7 +637,7 @@ src/framing/src/framegen64.o : %.o : %.c $(include_headers)
src/framing/src/framesync64.o : %.o : %.c $(include_headers)
src/framing/src/flexframegen.o : %.o : %.c $(include_headers)
src/framing/src/flexframesync.o : %.o : %.c $(include_headers)
src/framing/src/msourcecf.o : %.o : %.c $(include_headers) src/framing/src/msource.c
src/framing/src/msourcecf.o : %.o : %.c $(include_headers) src/framing/src/msource.c src/framing/src/qsource.c
src/framing/src/ofdmflexframegen.o : %.o : %.c $(include_headers)
src/framing/src/ofdmflexframesync.o : %.o : %.c $(include_headers)
src/framing/src/presync_cccf.o : %.o : %.c $(include_headers) src/framing/src/presync.c
Expand Down Expand Up @@ -1426,6 +1429,7 @@ example_programs := \
examples/firdecim_crcf_example \
examples/firfarrow_rrrf_example \
examples/firfilt_cccf_example \
examples/firfilt_cccf_notch_example \
examples/firfilt_crcf_example \
examples/firfilt_crcf_dcblocker_example \
examples/firfilt_rrrf_example \
Expand Down Expand Up @@ -1480,6 +1484,7 @@ example_programs := \
examples/modem_example \
examples/modem_soft_example \
examples/modular_arithmetic_example \
examples/msequence_generator_example \
examples/msequence_example \
examples/msourcecf_example \
examples/msresamp_crcf_example \
Expand Down Expand Up @@ -1640,6 +1645,7 @@ sandbox_programs = \
sandbox/ofdm_ber_test \
sandbox/ofdmframe_papr_test \
sandbox/ofdmframesync_cfo_test \
sandbox/pll_3rd_order_test \
sandbox/pll_design_test \
sandbox/predemod_sync_test \
sandbox/quasinewton_test \
Expand All @@ -1654,14 +1660,14 @@ sandbox_programs = \
sandbox/symsync_eqlms_test \
sandbox/svd_test \
sandbox/thiran_allpass_iir_test \
sandbox/throttle_test \
sandbox/vectorcf_test \

# sandbox/packetizer_persistent_ber_test
# firpfbch_analysis_test
# sandbox/ofdmoqam_firpfbch_cfo_test
# sandbox/mdct_test
# sandbox/fct_test
# sandbox/throttle_test # needs -lrt for certain gcc versions, rpi3


sandbox_objects = $(patsubst %,%.o,$(sandbox_programs))
Expand All @@ -1679,22 +1685,10 @@ clean-sandbox:
$(RM) sandbox/*.o
$(RM) $(sandbox_programs)


.PHONY: tools
tools_programs = \
tools/msequence_generator \

tools_objects = $(patsubst %,%.o,$(tools_programs))
tools: $(tools_programs)

$(tools_objects): %.o: %.c

$(tools_programs): % : %.o ${ARCHIVE_LIB}
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)

clean-tools:
$(RM) tools/*.o
$(RM) $(tools_programs)
##
## TARGET : programs - build all programs, but don't run anything
##
programs: all xautotest benchmark examples sandbox

##
## TARGET : world - build absolutely everything
Expand Down Expand Up @@ -1732,7 +1726,7 @@ clean-modules:
$(RM) src/vector/src/*.o src/vector/bench/*.o src/vector/tests/*.o
$(RM) src/libliquid.o

clean: clean-modules clean-autoscript clean-check clean-bench clean-examples clean-sandbox clean-tools
clean: clean-modules clean-autoscript clean-check clean-bench clean-examples clean-sandbox
$(RM) ${ARCHIVE_LIB} ${SHARED_LIB} $(extra_clean)

##
Expand Down
38 changes: 16 additions & 22 deletions external/liquid-dsp/makefile.mingw64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2007 - 2018 Joseph Gaeddert
# Copyright (c) 2007 - 2019 Joseph Gaeddert
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -31,6 +31,7 @@
# bench : build and run benchmarking program
# examples : build all examples
# sandbox : build all sandbox examples
# programs : build all programs, but don't run anything
# world : build absolutely everything (but don't install)
#
# clean-modules : clean all modules
Expand All @@ -42,8 +43,8 @@

# autoconf initialization macros
NAME := liquid-dsp
VERSION := 1.3.1
BUGREPORT := support@liquidsdr.org
VERSION := 1.3.2
BUGREPORT := joseph@liquidsdr.org

# paths
srcdir := .
Expand Down Expand Up @@ -482,6 +483,7 @@ filter_autotests := \
src/filter/tests/firdecim_xxxf_autotest.c \
src/filter/tests/firdes_autotest.c \
src/filter/tests/firdespm_autotest.c \
src/filter/tests/firfilt_cccf_notch_autotest.c \
src/filter/tests/firfilt_xxxf_autotest.c \
src/filter/tests/firhilb_autotest.c \
src/filter/tests/firinterp_autotest.c \
Expand All @@ -490,6 +492,7 @@ filter_autotests := \
src/filter/tests/iirdes_autotest.c \
src/filter/tests/iirfilt_xxxf_autotest.c \
src/filter/tests/iirfiltsos_rrrf_autotest.c \
src/filter/tests/lpc_autotest.c \
src/filter/tests/msresamp_crcf_autotest.c \
src/filter/tests/rresamp_crcf_autotest.c \
src/filter/tests/resamp_crcf_autotest.c \
Expand Down Expand Up @@ -634,7 +637,7 @@ src/framing/src/framegen64.o : %.o : %.c $(include_headers)
src/framing/src/framesync64.o : %.o : %.c $(include_headers)
src/framing/src/flexframegen.o : %.o : %.c $(include_headers)
src/framing/src/flexframesync.o : %.o : %.c $(include_headers)
src/framing/src/msourcecf.o : %.o : %.c $(include_headers) src/framing/src/msource.c
src/framing/src/msourcecf.o : %.o : %.c $(include_headers) src/framing/src/msource.c src/framing/src/qsource.c
src/framing/src/ofdmflexframegen.o : %.o : %.c $(include_headers)
src/framing/src/ofdmflexframesync.o : %.o : %.c $(include_headers)
src/framing/src/presync_cccf.o : %.o : %.c $(include_headers) src/framing/src/presync.c
Expand Down Expand Up @@ -1426,6 +1429,7 @@ example_programs := \
examples/firdecim_crcf_example \
examples/firfarrow_rrrf_example \
examples/firfilt_cccf_example \
examples/firfilt_cccf_notch_example \
examples/firfilt_crcf_example \
examples/firfilt_crcf_dcblocker_example \
examples/firfilt_rrrf_example \
Expand Down Expand Up @@ -1480,6 +1484,7 @@ example_programs := \
examples/modem_example \
examples/modem_soft_example \
examples/modular_arithmetic_example \
examples/msequence_generator_example \
examples/msequence_example \
examples/msourcecf_example \
examples/msresamp_crcf_example \
Expand Down Expand Up @@ -1640,6 +1645,7 @@ sandbox_programs = \
sandbox/ofdm_ber_test \
sandbox/ofdmframe_papr_test \
sandbox/ofdmframesync_cfo_test \
sandbox/pll_3rd_order_test \
sandbox/pll_design_test \
sandbox/predemod_sync_test \
sandbox/quasinewton_test \
Expand All @@ -1654,14 +1660,14 @@ sandbox_programs = \
sandbox/symsync_eqlms_test \
sandbox/svd_test \
sandbox/thiran_allpass_iir_test \
sandbox/throttle_test \
sandbox/vectorcf_test \

# sandbox/packetizer_persistent_ber_test
# firpfbch_analysis_test
# sandbox/ofdmoqam_firpfbch_cfo_test
# sandbox/mdct_test
# sandbox/fct_test
# sandbox/throttle_test # needs -lrt for certain gcc versions, rpi3


sandbox_objects = $(patsubst %,%.o,$(sandbox_programs))
Expand All @@ -1679,22 +1685,10 @@ clean-sandbox:
$(RM) sandbox/*.o
$(RM) $(sandbox_programs)


.PHONY: tools
tools_programs = \
tools/msequence_generator \

tools_objects = $(patsubst %,%.o,$(tools_programs))
tools: $(tools_programs)

$(tools_objects): %.o: %.c

$(tools_programs): % : %.o ${ARCHIVE_LIB}
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)

clean-tools:
$(RM) tools/*.o
$(RM) $(tools_programs)
##
## TARGET : programs - build all programs, but don't run anything
##
programs: all xautotest benchmark examples sandbox

##
## TARGET : world - build absolutely everything
Expand Down Expand Up @@ -1732,7 +1726,7 @@ clean-modules:
$(RM) src/vector/src/*.o src/vector/bench/*.o src/vector/tests/*.o
$(RM) src/libliquid.o

clean: clean-modules clean-autoscript clean-check clean-bench clean-examples clean-sandbox clean-tools
clean: clean-modules clean-autoscript clean-check clean-bench clean-examples clean-sandbox
$(RM) ${ARCHIVE_LIB} ${SHARED_LIB} $(extra_clean)

##
Expand Down
Loading

0 comments on commit e0d1e2b

Please sign in to comment.