[macos] Set KFR_ARCH to the right thing, raise minimum CPU to sandy b…

…ridge
ossia · Aug 2, 2023 · d4e0c13 · d4e0c13
1 parent c20ad79
commit d4e0c13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.cninja/macos-release.cmake b/.cninja/macos-release.cmake
@@ -11,10 +11,10 @@ execute_process(
 )
 set_cache(CMAKE_OSX_SYSROOT "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk")
 
-string(APPEND CMAKE_C_FLAGS_INIT " -march=core2 -mtune=haswell")
-string(APPEND CMAKE_CXX_FLAGS_INIT " -march=core2 -mtune=haswell")
-
+string(APPEND CMAKE_C_FLAGS_INIT " -march=sandybridge -mtune=haswell")
+string(APPEND CMAKE_CXX_FLAGS_INIT " -march=sandybridge -mtune=haswell")
 
+set_cache(KFR_ARCH avx)
 set_cache(BUILD_SHARED_LIBS OFF)
 set_cache(CMAKE_INSTALL_MESSAGE NEVER)
 

diff --git a/src/plugins/score-plugin-avnd/AvndProcesses/AddressTools.hpp b/src/plugins/score-plugin-avnd/AvndProcesses/AddressTools.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <ossia/dataflow/exec_state_facade.hpp>
 #include <ossia/dataflow/execution_state.hpp>
+#include <ossia/detail/algorithms.hpp>
 #include <ossia/network/common/path.hpp>
 
 #include <halp/controls.hpp>

diff --git a/src/plugins/score-plugin-avnd/score_plugin_avnd.convolver.cpp b/src/plugins/score-plugin-avnd/score_plugin_avnd.convolver.cpp
@@ -1,3 +1,5 @@
+#include <Avnd/Factories.hpp>
+
 #if __has_include(<kfr/dft/convolution.hpp>)
 #include <kfr/kfr.h>
 #if QT_VERSION_CHECK(KFR_VERSION_MAJOR, KFR_VERSION_MINOR, KFR_VERSION_PATCH) \
@@ -7,7 +9,6 @@
 #endif
 #endif
 
-#include <Avnd/Factories.hpp>
 namespace oscr
 {
 void instantiate_convolver(

diff --git a/src/plugins/score-plugin-avnd/score_plugin_avnd.cpp b/src/plugins/score-plugin-avnd/score_plugin_avnd.cpp
@@ -23,7 +23,7 @@
 #include <score_plugin_engine.hpp>
 
 // clang-format off
-//#include <Avnd/Factories.hpp>
+#include <Avnd/Factories.hpp>
 #include "include.avnd.cpp"
 // clang-format on