fixes

jcelerier · Apr 28, 2024 · 95e5864 · 95e5864
1 parent 0dd0fd1
commit 95e5864
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -354,7 +354,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     add_compile_options(-Wno-c++1z-extensions -Wno-psabi
                         -Wno-unknown-warning-option)
 endif ()
-if (WIN32)
+if (MSVC)
     add_compile_options(/wd4141)
     target_compile_options(kfr INTERFACE $<$<CXX_COMPILER_ID:MSVC>:/Zc:lambda>)
 endif ()

diff --git a/cmake/link_as_whole.cmake b/cmake/link_as_whole.cmake
@@ -2,7 +2,7 @@
 function (link_as_whole TARGET TYPE LIBRARY)
     if (APPLE)
         target_link_options(${TARGET} ${TYPE} "LINKER:-force_load,$<TARGET_FILE:${LIBRARY}>")
-    elseif (WIN32)
+    elseif (MSVC)
         target_link_options(${TARGET} ${TYPE}
                             /WHOLEARCHIVE:$<TARGET_FILE:${LIBRARY}>)
     else ()

diff --git a/include/kfr/multiarch.h b/include/kfr/multiarch.h
@@ -159,7 +159,7 @@
     }
 #endif
 
-#if defined(CMT_BASE_ARCH) || !defined(CMT_MULTI)
+#if 1
 #define CMT_MULTI_NEEDS_GATE
 #else
 #endif
@@ -188,7 +188,7 @@
     __VA_ARGS__                                                                                              \
     }
 
-#if defined(CMT_BASE_ARCH) || !defined(CMT_MULTI)
+#if 1
 #define CMT_MULTI_NEEDS_GATE
 #else
 #endif

diff --git a/src/dft/convolution-impl.cpp b/src/dft/convolution-impl.cpp
@@ -233,7 +233,7 @@ template class convolve_filter<complex<double>>;
 
 } // namespace CMT_ARCH_NAME
 
-#ifdef CMT_MULTI_NEEDS_GATE
+#if 1
 namespace internal_generic
 {
 template <typename T>

diff --git a/src/dft/dft.cpp b/src/dft/dft.cpp
@@ -133,7 +133,7 @@ CMT_MULTI_PROTO(namespace impl {
     void dft_initialize_transpose(internal_generic::fn_transpose<T> & transpose);
 })
 
-#ifdef CMT_MULTI_NEEDS_GATE
+#if 1
 
 namespace internal_generic
 {

diff --git a/src/dft/version.cpp b/src/dft/version.cpp
@@ -2,5 +2,4 @@
 
 namespace kfr
 {
-const char* library_version_dft() { return KFR_VERSION_FULL; }
 } // namespace kfr
diff --git a/src/dsp/biquad.cpp b/src/dsp/biquad.cpp
@@ -49,7 +49,7 @@ template expression_handle<double, 1> create_iir_filter<double>(const iir_params
 } // namespace impl
 } // namespace CMT_ARCH_NAME
 
-#ifdef CMT_MULTI_NEEDS_GATE
+#if 1
 
 template <typename T>
 iir_filter<T>::iir_filter(const iir_params<T>& params)

diff --git a/src/dsp/fir.cpp b/src/dsp/fir.cpp
@@ -68,7 +68,7 @@ template class fir_filter<double, complex<double>>;
 } // namespace impl
 } // namespace CMT_ARCH_NAME
 
-#ifdef CMT_MULTI_NEEDS_GATE
+#if 1
 
 template <typename T, typename U>
 void fir_filter<T, U>::process_buffer(U* dest, const U* src, size_t size)

diff --git a/src/dsp/sample_rate_conversion.cpp b/src/dsp/sample_rate_conversion.cpp
@@ -151,7 +151,7 @@ template struct samplerate_converter<complex<double>>;
 } // namespace impl
 } // namespace CMT_ARCH_NAME
 
-#ifdef CMT_MULTI_NEEDS_GATE
+#if 1
 
 template <typename T>
 samplerate_converter<T>::samplerate_converter(sample_rate_conversion_quality quality,

diff --git a/src/dsp/version.cpp b/src/dsp/version.cpp
@@ -2,5 +2,4 @@
 
 namespace kfr
 {
-const char* library_version_dsp() { return KFR_VERSION_FULL; }
 } // namespace kfr
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,7 +133,7 @@ CMT_MULTI_PROTO(namespace impl { @@
         void dft_initialize_transpose(internal_generic::fn_transpose<T> & transpose);
     })
-    #ifdef CMT_MULTI_NEEDS_GATE
+    #if 1
     namespace internal_generic
     {
@@ Expand Down @@