comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-07-30 14:04:07 -04:00
Code Issues Projects Releases Wiki Activity

Updated Windows liquid-dsp binaries to v1.31 (gcc 7.2.0)

Browse Source
This commit is contained in:
vsonnier
2017-10-26 07:04:36 +02:00
parent 3cc49bdb15
commit 950a4622b7
17 changed files with 9056 additions and 8610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/liquid-dsp/gcc/32/libliquid.a
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/gcc/32/libliquid.def
Vendored
+2141 -2076
View File
File diff suppressed because it is too large Load Diff
external/liquid-dsp/gcc/32/libliquid.dll
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/gcc/64/libliquid.a
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/gcc/64/libliquid.def
Vendored
+2141 -2076
View File
File diff suppressed because it is too large Load Diff
external/liquid-dsp/gcc/64/libliquid.dll
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/include/liquid/liquid.h
Vendored
+423 -233
View File
File diff suppressed because it is too large Load Diff
external/liquid-dsp/makefile.mingw32
Vendored
+35 -37
View File
@@ -43,7 +43,7 @@
# autoconf initialization macros # autoconf initialization macros
NAME := liquid-dsp NAME := liquid-dsp
VERSION := 1.3.0 VERSION := 1.3.1
BUGREPORT := support@liquidsdr.org BUGREPORT := support@liquidsdr.org
# paths # paths
@@ -64,17 +64,13 @@ RANLIB := ranlib
# flags # flags
INCLUDE_CFLAGS = $(addprefix -I ,$(include_dirs)) INCLUDE_CFLAGS = $(addprefix -I ,$(include_dirs))
#MINGW: optimizations goes here #MINGW: optimizations goes here
CONFIG_CFLAGS = -m32 -O3 -msse3 -ffast-math CONFIG_CFLAGS = -m32 -O3 -msse3 -ffast-math
CPPFLAGS = $(INCLUDE_CFLAGS)
# -g : debugging info CFLAGS = $(CONFIG_CFLAGS) -Wall -fPIC
CFLAGS += $(INCLUDE_CFLAGS) -Wall -fPIC $(CONFIG_CFLAGS) LDFLAGS =
#MINGW:
#LDFLAGS += -lm -lc LIBS += -lmsvcrt
#MINGW:
LDFLAGS += -lmsvcrt
ARFLAGS = r ARFLAGS = r
PATHSEP = / PATHSEP = /
@@ -347,8 +343,8 @@ src/fft/src/dct.o : %.o : %.c $(include_headers)
src/fft/src/fftf.o : %.o : %.c $(include_headers) src/fft/src/fftf.o : %.o : %.c $(include_headers)
src/fft/src/fft_utilities.o : %.o : %.c $(include_headers) src/fft/src/fft_utilities.o : %.o : %.c $(include_headers)
src/fft/src/mdct.o : %.o : %.c $(include_headers) src/fft/src/mdct.o : %.o : %.c $(include_headers)
src/fft/src/spgramcf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spgramcf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spwaterfall.c
src/fft/src/spgramf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spgramf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spwaterfall.c
# fft autotest scripts # fft autotest scripts
fft_autotests := \ fft_autotests := \
@@ -657,6 +653,7 @@ framing_benchmarks := \
src/framing/bench/flexframesync_benchmark.c \ src/framing/bench/flexframesync_benchmark.c \
src/framing/bench/framesync64_benchmark.c \ src/framing/bench/framesync64_benchmark.c \
src/framing/bench/gmskframesync_benchmark.c \ src/framing/bench/gmskframesync_benchmark.c \
src/framing/bench/qdetector_benchmark.c \
# #
@@ -1158,8 +1155,6 @@ benchmark_sources := \
.PHONY: all .PHONY: all
# Shared library # Shared library
#SHARED_LIB = libliquid.so
#MINGW: #MINGW:
SHARED_LIB = libliquid.dll SHARED_LIB = libliquid.dll
@@ -1172,15 +1167,14 @@ libliquid.a: $(objects)
# #
# gcc -dynamiclib -install_name libliquid.dylib -o libliquid.dylib libmodem.a libutility.a # gcc -dynamiclib -install_name libliquid.dylib -o libliquid.dylib libmodem.a libutility.a
libliquid.dylib: $(objects) libliquid.dylib: $(objects)
$(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
# linux, et al # linux, et al
libliquid.so: libliquid.a libliquid.so: libliquid.a
$(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
#MINGW:
# MINGW*
libliquid.dll: libliquid.a libliquid.dll: libliquid.a
$(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LDFLAGS) $(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LIBS)
all: libliquid.a $(SHARED_LIB) all: libliquid.a $(SHARED_LIB)
@@ -1236,10 +1230,10 @@ uninstall:
autoscript : scripts/autoscript autoscript : scripts/autoscript
scripts/autoscript.o scripts/main.o : %.o : %.c scripts/autoscript.o scripts/main.o : %.o : %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
scripts/autoscript : scripts/autoscript.o scripts/main.o scripts/autoscript : scripts/autoscript.o scripts/main.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
clean-autoscript : clean-autoscript :
$(RM) scripts/autoscript.o scripts/main.o scripts/autoscript $(RM) scripts/autoscript.o scripts/main.o scripts/autoscript
@@ -1265,23 +1259,23 @@ autotest_include.h : scripts/autoscript $(autotest_sources) $(include_headers)
# the '-x c' flag # the '-x c' flag
autotest_obj = $(patsubst %.c,%.o,$(autotest_sources)) autotest_obj = $(patsubst %.c,%.o,$(autotest_sources))
$(autotest_obj) : %.o : %.c $(include_headers) $(autotest_obj) : %.o : %.c $(include_headers)
$(CC) $(CFLAGS) $< -c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# additional autotest objects # additional autotest objects
$(autotest_extra_obj) : %.o : %.c $(include_headers) $(autotest_extra_obj) : %.o : %.c $(include_headers)
# compile the autotest internal library functions without linking # compile the autotest internal library functions without linking
autotest/autotestlib.o : autotest/autotestlib.c autotest/autotest.h autotest/autotestlib.o : autotest/autotestlib.c autotest/autotest.h
$(CC) $(CFLAGS) $< -c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# compile the autotest program without linking # compile the autotest program without linking
$(autotest_prog).o : autotest/autotest.c autotest/autotest.h autotest_include.h $(autotest_prog).o : autotest/autotest.c autotest/autotest.h autotest_include.h
$(CC) $(CFLAGS) $< -c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# link the autotest program with the objects # link the autotest program with the objects
# NOTE: linked libraries must come _after_ the target program # NOTE: linked libraries must come _after_ the target program
$(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) autotest/autotestlib.o libliquid.a $(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) autotest/autotestlib.o libliquid.a
$(CC) $^ -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
# run the autotest program # run the autotest program
check: $(autotest_prog) check: $(autotest_prog)
@@ -1306,8 +1300,10 @@ clean-check:
# on the target platform. # on the target platform.
.PHONY: bench .PHONY: bench
bench_prog = benchmark bench_prog = benchmark
BENCH_CFLAGS = -Wall $(INCLUDE_CFLAGS) $(CONFIG_CFLAGS) BENCH_CPPFLAGS = $(CPPFLAGS)
BENCH_CFLAGS = -Wall $(CFLAGS)
BENCH_LDFLAGS = $(LDFLAGS) BENCH_LDFLAGS = $(LDFLAGS)
BENCH_LIBS = $(LIBS)
# run the benchmark generator script to create benchmark_include.h # run the benchmark generator script to create benchmark_include.h
benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers) benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers)
@@ -1319,19 +1315,19 @@ benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers)
# the '-x c' flag # the '-x c' flag
benchmark_obj = $(patsubst %.c,%.o,$(benchmark_sources)) benchmark_obj = $(patsubst %.c,%.o,$(benchmark_sources))
$(benchmark_obj) : %.o : %.c $(include_headers) $(benchmark_obj) : %.o : %.c $(include_headers)
$(CC) $(BENCH_CFLAGS) $< -c -o $@ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $@
# additional benchmark objects # additional benchmark objects
$(benchmark_extra_obj) : %.o : %.c $(include_headers) $(benchmark_extra_obj) : %.o : %.c $(include_headers)
# compile the benchmark program without linking # compile the benchmark program without linking
$(bench_prog).o: bench/bench.c benchmark_include.h bench/bench.c $(bench_prog).o: bench/bench.c benchmark_include.h bench/bench.c
$(CC) $(BENCH_CFLAGS) $< -c -o $(bench_prog).o $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $(bench_prog).o
# link the benchmark program with the library objects # link the benchmark program with the library objects
# NOTE: linked libraries must come _after_ the target program # NOTE: linked libraries must come _after_ the target program
$(bench_prog): $(bench_prog).o $(benchmark_obj) $(benchmark_extra_obj) libliquid.a $(bench_prog): $(bench_prog).o $(benchmark_obj) $(benchmark_extra_obj) libliquid.a
$(CC) $^ -o $(bench_prog) $(BENCH_LDFLAGS) $(CC) $(BENCH_CFLAGS) $(BENCH_LDFLAGS) $^ -o $(bench_prog) $(BENCH_LIBS)
# run the benchmark program # run the benchmark program
bench: $(bench_prog) bench: $(bench_prog)
@@ -1339,14 +1335,14 @@ bench: $(bench_prog)
# benchmark compare script # benchmark compare script
scripts/benchmark_compare : % : %.c scripts/benchmark_compare : % : %.c
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
# fftbench program # fftbench program
bench/fftbench.o : %.o : %.c bench/fftbench.o : %.o : %.c
$(CC) $(BENCH_CFLAGS) $< -c -o $@ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $@
bench/fftbench : % : %.o libliquid.a bench/fftbench : % : %.o libliquid.a
$(CC) $^ -o $@ $(BENCH_LDFLAGS) $(CC) $(BENCH_CFLAGS) $(BENCH_LDFLAGS) $^ -o $@ $(BENCH_LIBS)
# clean up the generated files # clean up the generated files
clean-bench: clean-bench:
@@ -1364,6 +1360,7 @@ clean-bench:
.PHONY: examples .PHONY: examples
example_programs := \ example_programs := \
examples/agc_crcf_example \ examples/agc_crcf_example \
examples/agc_crcf_squelch_example \
examples/agc_crcf_qpsk_example \ examples/agc_crcf_qpsk_example \
examples/agc_rrrf_example \ examples/agc_rrrf_example \
examples/ampmodem_example \ examples/ampmodem_example \
@@ -1403,7 +1400,9 @@ example_programs := \
examples/firfilt_crcf_example \ examples/firfilt_crcf_example \
examples/firfilt_rrrf_example \ examples/firfilt_rrrf_example \
examples/firdes_kaiser_example \ examples/firdes_kaiser_example \
examples/firdespm_callback_example \
examples/firdespm_example \ examples/firdespm_example \
examples/firdespm_lowpass_example \
examples/firhilb_example \ examples/firhilb_example \
examples/firhilb_decim_example \ examples/firhilb_decim_example \
examples/firhilb_interp_example \ examples/firhilb_interp_example \
@@ -1480,6 +1479,7 @@ example_programs := \
examples/spgramcf_example \ examples/spgramcf_example \
examples/spgramcf_waterfall_example \ examples/spgramcf_waterfall_example \
examples/spgramf_example \ examples/spgramf_example \
examples/spwaterfallcf_example \
examples/symsync_crcf_example \ examples/symsync_crcf_example \
examples/symsync_crcf_full_example \ examples/symsync_crcf_full_example \
examples/symsync_crcf_kaiser_example \ examples/symsync_crcf_kaiser_example \
@@ -1496,13 +1496,11 @@ example_programs := \
example_objects = $(patsubst %,%.o,$(example_programs)) example_objects = $(patsubst %,%.o,$(example_programs))
examples: $(example_programs) examples: $(example_programs)
EXAMPLES_LDFLAGS = $(LDFLAGS)
# NOTE: linked libraries must come _after_ the target program # NOTE: linked libraries must come _after_ the target program
$(example_objects): %.o : %.c $(example_objects): %.o : %.c
$(example_programs): % : %.o libliquid.a $(example_programs): % : %.o libliquid.a
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
# clean examples # clean examples
clean-examples: clean-examples:
@@ -1624,7 +1622,7 @@ SANDBOX_LDFLAGS = $(LDFLAGS) -lfftw3f
$(sandbox_objects): %.o : %.c $(sandbox_objects): %.o : %.c
$(sandbox_programs): % : %.o libliquid.a $(sandbox_programs): % : %.o libliquid.a
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
# clean sandbox # clean sandbox
clean-sandbox: clean-sandbox:
external/liquid-dsp/makefile.mingw64
Vendored
+34 -36
View File
@@ -43,7 +43,7 @@
# autoconf initialization macros # autoconf initialization macros
NAME := liquid-dsp NAME := liquid-dsp
VERSION := 1.3.0 VERSION := 1.3.1
BUGREPORT := support@liquidsdr.org BUGREPORT := support@liquidsdr.org
# paths # paths
@@ -64,17 +64,13 @@ RANLIB := ranlib
# flags # flags
INCLUDE_CFLAGS = $(addprefix -I ,$(include_dirs)) INCLUDE_CFLAGS = $(addprefix -I ,$(include_dirs))
#MINGW: optimizations goes here #MINGW: optimizations goes here
CONFIG_CFLAGS = -O3 -msse3 -ffast-math -static-libgcc -static-libstdc++ CONFIG_CFLAGS = -O3 -msse3 -ffast-math -static-libgcc -static-libstdc++
CPPFLAGS = $(INCLUDE_CFLAGS)
# -g : debugging info CFLAGS = $(CONFIG_CFLAGS) -Wall -fPIC
CFLAGS += $(INCLUDE_CFLAGS) -Wall -fPIC $(CONFIG_CFLAGS) LDFLAGS =
#MINGW:
#LDFLAGS += -lm -lc LIBS += -static-libgcc -static-libstdc++
#MINGW:
LDFLAGS += -static-libgcc -static-libstdc++
ARFLAGS = r ARFLAGS = r
PATHSEP = / PATHSEP = /
@@ -347,8 +343,8 @@ src/fft/src/dct.o : %.o : %.c $(include_headers)
src/fft/src/fftf.o : %.o : %.c $(include_headers) src/fft/src/fftf.o : %.o : %.c $(include_headers)
src/fft/src/fft_utilities.o : %.o : %.c $(include_headers) src/fft/src/fft_utilities.o : %.o : %.c $(include_headers)
src/fft/src/mdct.o : %.o : %.c $(include_headers) src/fft/src/mdct.o : %.o : %.c $(include_headers)
src/fft/src/spgramcf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spgramcf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spwaterfall.c
src/fft/src/spgramf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spgramf.o : %.o : %.c $(include_headers) src/fft/src/asgram.c src/fft/src/spgram.c src/fft/src/spwaterfall.c
# fft autotest scripts # fft autotest scripts
fft_autotests := \ fft_autotests := \
@@ -657,6 +653,7 @@ framing_benchmarks := \
src/framing/bench/flexframesync_benchmark.c \ src/framing/bench/flexframesync_benchmark.c \
src/framing/bench/framesync64_benchmark.c \ src/framing/bench/framesync64_benchmark.c \
src/framing/bench/gmskframesync_benchmark.c \ src/framing/bench/gmskframesync_benchmark.c \
src/framing/bench/qdetector_benchmark.c \
# #
@@ -1158,8 +1155,6 @@ benchmark_sources := \
.PHONY: all .PHONY: all
# Shared library # Shared library
#SHARED_LIB = libliquid.so
#MINGW: #MINGW:
SHARED_LIB = libliquid.dll SHARED_LIB = libliquid.dll
@@ -1172,15 +1167,14 @@ libliquid.a: $(objects)
# #
# gcc -dynamiclib -install_name libliquid.dylib -o libliquid.dylib libmodem.a libutility.a # gcc -dynamiclib -install_name libliquid.dylib -o libliquid.dylib libmodem.a libutility.a
libliquid.dylib: $(objects) libliquid.dylib: $(objects)
$(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
# linux, et al # linux, et al
libliquid.so: libliquid.a libliquid.so: libliquid.a
$(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
#MINGW:
# MINGW*
libliquid.dll: libliquid.a libliquid.dll: libliquid.a
$(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LDFLAGS) $(CC) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive -Wl,--output-def,libliquid.def -Wl,--out-implib,libliquid.lib $(LIBS)
all: libliquid.a $(SHARED_LIB) all: libliquid.a $(SHARED_LIB)
@@ -1236,10 +1230,10 @@ uninstall:
autoscript : scripts/autoscript autoscript : scripts/autoscript
scripts/autoscript.o scripts/main.o : %.o : %.c scripts/autoscript.o scripts/main.o : %.o : %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
scripts/autoscript : scripts/autoscript.o scripts/main.o scripts/autoscript : scripts/autoscript.o scripts/main.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
clean-autoscript : clean-autoscript :
$(RM) scripts/autoscript.o scripts/main.o scripts/autoscript $(RM) scripts/autoscript.o scripts/main.o scripts/autoscript
@@ -1265,23 +1259,23 @@ autotest_include.h : scripts/autoscript $(autotest_sources) $(include_headers)
# the '-x c' flag # the '-x c' flag
autotest_obj = $(patsubst %.c,%.o,$(autotest_sources)) autotest_obj = $(patsubst %.c,%.o,$(autotest_sources))
$(autotest_obj) : %.o : %.c $(include_headers) $(autotest_obj) : %.o : %.c $(include_headers)
$(CC) $(CFLAGS) $< -c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# additional autotest objects # additional autotest objects
$(autotest_extra_obj) : %.o : %.c $(include_headers) $(autotest_extra_obj) : %.o : %.c $(include_headers)
# compile the autotest internal library functions without linking # compile the autotest internal library functions without linking
autotest/autotestlib.o : autotest/autotestlib.c autotest/autotest.h autotest/autotestlib.o : autotest/autotestlib.c autotest/autotest.h
$(CC) $(CFLAGS) $< -c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# compile the autotest program without linking # compile the autotest program without linking
$(autotest_prog).o : autotest/autotest.c autotest/autotest.h autotest_include.h $(autotest_prog).o : autotest/autotest.c autotest/autotest.h autotest_include.h
$(CC) $(CFLAGS) $< -c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# link the autotest program with the objects # link the autotest program with the objects
# NOTE: linked libraries must come _after_ the target program # NOTE: linked libraries must come _after_ the target program
$(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) autotest/autotestlib.o libliquid.a $(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) autotest/autotestlib.o libliquid.a
$(CC) $^ -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
# run the autotest program # run the autotest program
check: $(autotest_prog) check: $(autotest_prog)
@@ -1306,8 +1300,10 @@ clean-check:
# on the target platform. # on the target platform.
.PHONY: bench .PHONY: bench
bench_prog = benchmark bench_prog = benchmark
BENCH_CFLAGS = -Wall $(INCLUDE_CFLAGS) $(CONFIG_CFLAGS) BENCH_CPPFLAGS = $(CPPFLAGS)
BENCH_CFLAGS = -Wall $(CFLAGS)
BENCH_LDFLAGS = $(LDFLAGS) BENCH_LDFLAGS = $(LDFLAGS)
BENCH_LIBS = $(LIBS)
# run the benchmark generator script to create benchmark_include.h # run the benchmark generator script to create benchmark_include.h
benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers) benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers)
@@ -1319,19 +1315,19 @@ benchmark_include.h : scripts/autoscript $(benchmark_sources) $(include_headers)
# the '-x c' flag # the '-x c' flag
benchmark_obj = $(patsubst %.c,%.o,$(benchmark_sources)) benchmark_obj = $(patsubst %.c,%.o,$(benchmark_sources))
$(benchmark_obj) : %.o : %.c $(include_headers) $(benchmark_obj) : %.o : %.c $(include_headers)
$(CC) $(BENCH_CFLAGS) $< -c -o $@ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $@
# additional benchmark objects # additional benchmark objects
$(benchmark_extra_obj) : %.o : %.c $(include_headers) $(benchmark_extra_obj) : %.o : %.c $(include_headers)
# compile the benchmark program without linking # compile the benchmark program without linking
$(bench_prog).o: bench/bench.c benchmark_include.h bench/bench.c $(bench_prog).o: bench/bench.c benchmark_include.h bench/bench.c
$(CC) $(BENCH_CFLAGS) $< -c -o $(bench_prog).o $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $(bench_prog).o
# link the benchmark program with the library objects # link the benchmark program with the library objects
# NOTE: linked libraries must come _after_ the target program # NOTE: linked libraries must come _after_ the target program
$(bench_prog): $(bench_prog).o $(benchmark_obj) $(benchmark_extra_obj) libliquid.a $(bench_prog): $(bench_prog).o $(benchmark_obj) $(benchmark_extra_obj) libliquid.a
$(CC) $^ -o $(bench_prog) $(BENCH_LDFLAGS) $(CC) $(BENCH_CFLAGS) $(BENCH_LDFLAGS) $^ -o $(bench_prog) $(BENCH_LIBS)
# run the benchmark program # run the benchmark program
bench: $(bench_prog) bench: $(bench_prog)
@@ -1339,14 +1335,14 @@ bench: $(bench_prog)
# benchmark compare script # benchmark compare script
scripts/benchmark_compare : % : %.c scripts/benchmark_compare : % : %.c
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
# fftbench program # fftbench program
bench/fftbench.o : %.o : %.c bench/fftbench.o : %.o : %.c
$(CC) $(BENCH_CFLAGS) $< -c -o $@ $(CC) $(BENCH_CPPFLAGS) $(BENCH_CFLAGS) $< -c -o $@
bench/fftbench : % : %.o libliquid.a bench/fftbench : % : %.o libliquid.a
$(CC) $^ -o $@ $(BENCH_LDFLAGS) $(CC) $(BENCH_CFLAGS) $(BENCH_LDFLAGS) $^ -o $@ $(BENCH_LIBS)
# clean up the generated files # clean up the generated files
clean-bench: clean-bench:
@@ -1364,6 +1360,7 @@ clean-bench:
.PHONY: examples .PHONY: examples
example_programs := \ example_programs := \
examples/agc_crcf_example \ examples/agc_crcf_example \
examples/agc_crcf_squelch_example \
examples/agc_crcf_qpsk_example \ examples/agc_crcf_qpsk_example \
examples/agc_rrrf_example \ examples/agc_rrrf_example \
examples/ampmodem_example \ examples/ampmodem_example \
@@ -1403,7 +1400,9 @@ example_programs := \
examples/firfilt_crcf_example \ examples/firfilt_crcf_example \
examples/firfilt_rrrf_example \ examples/firfilt_rrrf_example \
examples/firdes_kaiser_example \ examples/firdes_kaiser_example \
examples/firdespm_callback_example \
examples/firdespm_example \ examples/firdespm_example \
examples/firdespm_lowpass_example \
examples/firhilb_example \ examples/firhilb_example \
examples/firhilb_decim_example \ examples/firhilb_decim_example \
examples/firhilb_interp_example \ examples/firhilb_interp_example \
@@ -1480,6 +1479,7 @@ example_programs := \
examples/spgramcf_example \ examples/spgramcf_example \
examples/spgramcf_waterfall_example \ examples/spgramcf_waterfall_example \
examples/spgramf_example \ examples/spgramf_example \
examples/spwaterfallcf_example \
examples/symsync_crcf_example \ examples/symsync_crcf_example \
examples/symsync_crcf_full_example \ examples/symsync_crcf_full_example \
examples/symsync_crcf_kaiser_example \ examples/symsync_crcf_kaiser_example \
@@ -1496,13 +1496,11 @@ example_programs := \
example_objects = $(patsubst %,%.o,$(example_programs)) example_objects = $(patsubst %,%.o,$(example_programs))
examples: $(example_programs) examples: $(example_programs)
EXAMPLES_LDFLAGS = $(LDFLAGS)
# NOTE: linked libraries must come _after_ the target program # NOTE: linked libraries must come _after_ the target program
$(example_objects): %.o : %.c $(example_objects): %.o : %.c
$(example_programs): % : %.o libliquid.a $(example_programs): % : %.o libliquid.a
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
# clean examples # clean examples
clean-examples: clean-examples:
@@ -1624,7 +1622,7 @@ SANDBOX_LDFLAGS = $(LDFLAGS) -lfftw3f
$(sandbox_objects): %.o : %.c $(sandbox_objects): %.o : %.c
$(sandbox_programs): % : %.o libliquid.a $(sandbox_programs): % : %.o libliquid.a
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
# clean sandbox # clean sandbox
clean-sandbox: clean-sandbox:
external/liquid-dsp/msvc/32/libliquid.a
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/msvc/32/libliquid.def
Vendored
+2141 -2076
View File
File diff suppressed because it is too large Load Diff
external/liquid-dsp/msvc/32/libliquid.dll
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/msvc/32/libliquid.lib
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/msvc/64/libliquid.a
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/msvc/64/libliquid.def
Vendored
+2141 -2076
View File
File diff suppressed because it is too large Load Diff
external/liquid-dsp/msvc/64/libliquid.dll
Vendored
BIN
View File
Binary file not shown.
external/liquid-dsp/msvc/64/libliquid.lib
Vendored
BIN
View File
Binary file not shown.