diff options
Diffstat (limited to 'examples/multimedia/spectrum/3rdparty')
3 files changed, 31 insertions, 15 deletions
diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt new file mode 100644 index 000000000..6c2af7a83 --- /dev/null +++ b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt @@ -0,0 +1,27 @@ +find_package(Qt6 REQUIRED COMPONENTS Core) + +add_library(fftreal STATIC + Array.h Array.hpp + DynArray.h DynArray.hpp + FFTRealFixLen.h FFTRealFixLen.hpp + FFTRealFixLenParam.h + FFTRealPassDirect.h FFTRealPassDirect.hpp + FFTRealPassInverse.h FFTRealPassInverse.hpp + FFTRealSelect.h FFTRealSelect.hpp + FFTRealUseTrigo.h FFTRealUseTrigo.hpp + OscSinCos.h OscSinCos.hpp + def.h + fftreal_wrapper.cpp fftreal_wrapper.h +) + +target_compile_definitions(fftreal PRIVATE + FFTREAL_LIBRARY + LOG_ENGINE + LOG_SPECTRUMANALYSER + SPECTRUM_ANALYSER_SEPARATE_THREAD + SUPERIMPOSE_PROGRESS_ON_WAVEFORM +) + +target_link_libraries(fftreal PRIVATE Qt6::Core) + +target_include_directories(fftreal INTERFACE .) diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro index b2c96f96c..0b36ee7d1 100644 --- a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro +++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro @@ -1,8 +1,7 @@ include(../../spectrum.pri) -static: error(This library cannot be built for static linkage) - TEMPLATE = lib +CONFIG += static TARGET = fftreal # FFTReal @@ -24,18 +23,14 @@ HEADERS += Array.h \ OscSinCos.h \ OscSinCos.hpp \ def.h - + # Wrapper used to export the required instantiation of the FFTRealFixLen template HEADERS += fftreal_wrapper.h SOURCES += fftreal_wrapper.cpp DEFINES += FFTREAL_LIBRARY -macx { - CONFIG += lib_bundle -} else { - DESTDIR = ../..$${spectrum_build_dir} -} +DESTDIR = ../..$${spectrum_build_dir} EXAMPLE_FILES = bwins/fftreal.def eabi/fftreal.def readme.txt license.txt diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h index 2da3147ac..1b92d8e65 100644 --- a/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h +++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h @@ -22,12 +22,6 @@ #include <QtCore/QtGlobal> -#if defined(FFTREAL_LIBRARY) -# define FFTREAL_EXPORT Q_DECL_EXPORT -#else -# define FFTREAL_EXPORT Q_DECL_IMPORT -#endif - class FFTRealWrapperPrivate; // Each pass of the FFT processes 2^X samples, where X is the @@ -46,7 +40,7 @@ static const int FFTLengthPowerOfTwo = 12; * * See http://ldesoras.free.fr/prod.html */ -class FFTREAL_EXPORT FFTRealWrapper +class FFTRealWrapper { public: FFTRealWrapper(); |