Compare commits
2 Commits
a3385bd1f9
...
4f44118299
| Author | SHA1 | Date | |
|---|---|---|---|
| 4f44118299 | |||
| edd8991a3c |
@@ -7,6 +7,8 @@ java/build/
|
|||||||
|
|
||||||
# third_party — only fftw is downloaded manually, rnnoise and libspecbleach are tracked
|
# third_party — only fftw is downloaded manually, rnnoise and libspecbleach are tracked
|
||||||
third_party/fftw/
|
third_party/fftw/
|
||||||
|
third_party/**/*.o
|
||||||
|
third_party/**/*.a
|
||||||
|
|
||||||
# macOS
|
# macOS
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|||||||
+4
-2
@@ -238,7 +238,8 @@ $$(ABI_$(1)_FFTW_STAMP): $(FFTW_SRC)/configure
|
|||||||
@mkdir -p $$(ABI_$(1)_OBJDIR)/fftw-build $$(ABI_$(1)_FFTW_PREFIX)
|
@mkdir -p $$(ABI_$(1)_OBJDIR)/fftw-build $$(ABI_$(1)_FFTW_PREFIX)
|
||||||
cd $$(ABI_$(1)_OBJDIR)/fftw-build && \
|
cd $$(ABI_$(1)_OBJDIR)/fftw-build && \
|
||||||
$(abspath $(FFTW_SRC))/configure \
|
$(abspath $(FFTW_SRC))/configure \
|
||||||
--host=$(call fftw_host,$(1)) \
|
--build=$(shell uname -m)-linux-gnu \
|
||||||
|
--host=$(strip $(call fftw_host,$(1))) \
|
||||||
CC="$$(ABI_$(1)_CC)" \
|
CC="$$(ABI_$(1)_CC)" \
|
||||||
CFLAGS="-fPIC" \
|
CFLAGS="-fPIC" \
|
||||||
--prefix=$(abspath $$(ABI_$(1)_FFTW_PREFIX)) \
|
--prefix=$(abspath $$(ABI_$(1)_FFTW_PREFIX)) \
|
||||||
@@ -252,7 +253,8 @@ $$(ABI_$(1)_FFTWF_STAMP): $(FFTW_SRC)/configure
|
|||||||
@mkdir -p $$(ABI_$(1)_OBJDIR)/fftwf-build $$(ABI_$(1)_FFTWF_PREFIX)
|
@mkdir -p $$(ABI_$(1)_OBJDIR)/fftwf-build $$(ABI_$(1)_FFTWF_PREFIX)
|
||||||
cd $$(ABI_$(1)_OBJDIR)/fftwf-build && \
|
cd $$(ABI_$(1)_OBJDIR)/fftwf-build && \
|
||||||
$(abspath $(FFTW_SRC))/configure \
|
$(abspath $(FFTW_SRC))/configure \
|
||||||
--host=$(call fftw_host,$(1)) \
|
--build=$(shell uname -m)-linux-gnu \
|
||||||
|
--host=$(strip $(call fftw_host,$(1))) \
|
||||||
CC="$$(ABI_$(1)_CC)" \
|
CC="$$(ABI_$(1)_CC)" \
|
||||||
CFLAGS="-fPIC" \
|
CFLAGS="-fPIC" \
|
||||||
--prefix=$(abspath $$(ABI_$(1)_FFTWF_PREFIX)) \
|
--prefix=$(abspath $$(ABI_$(1)_FFTWF_PREFIX)) \
|
||||||
|
|||||||
@@ -38,15 +38,23 @@ FFTW_INST := $(CURDIR)/third_party/fftw-win64
|
|||||||
FFTW_BUILD_D := $(FFTW_INST)/build-double
|
FFTW_BUILD_D := $(FFTW_INST)/build-double
|
||||||
FFTW_BUILD_F := $(FFTW_INST)/build-float
|
FFTW_BUILD_F := $(FFTW_INST)/build-float
|
||||||
|
|
||||||
|
# FFTW_MARCH задаёт минимальный набор инструкций для Windows-бинарника.
|
||||||
|
# haswell (2013+) гарантирует AVX2+FMA — оптимальный выбор для SDR на современном ПК.
|
||||||
|
# Для совместимости со старыми машинами замените на -march=sandybridge (AVX, 2011+)
|
||||||
|
# или -march=core2 (SSSE3, 2007+).
|
||||||
|
FFTW_MARCH ?= -march=haswell
|
||||||
|
|
||||||
FFTW_CONF_COMMON = \
|
FFTW_CONF_COMMON = \
|
||||||
--host=$(MINGW_PREFIX) \
|
--host=$(MINGW_PREFIX) \
|
||||||
CC=$(CC) \
|
CC=$(CC) \
|
||||||
|
CFLAGS="$(FFTW_MARCH)" \
|
||||||
--prefix=$(FFTW_INST) \
|
--prefix=$(FFTW_INST) \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--with-our-malloc \
|
--with-our-malloc \
|
||||||
--enable-sse2 \
|
--enable-sse2 \
|
||||||
--enable-avx \
|
--enable-avx \
|
||||||
|
--enable-avx2 \
|
||||||
--disable-fortran \
|
--disable-fortran \
|
||||||
--quiet
|
--quiet
|
||||||
|
|
||||||
|
|||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Reference in New Issue
Block a user