diff --git a/cmake/OssiaOptions.cmake b/cmake/OssiaOptions.cmake index 7b2a160beae..840e82ed2b3 100644 --- a/cmake/OssiaOptions.cmake +++ b/cmake/OssiaOptions.cmake @@ -295,13 +295,7 @@ if(OSSIA_JAVA) endif() if(OSSIA_OSX_FAT_LIBRARIES) - string(REGEX MATCH "[0-9]+.[0-9]+" MACOS_SDK_VERSION "${CMAKE_OSX_SYSROOT}") - if(MACOS_SDK_VERSION VERSION_LESS 10.14) - set(CMAKE_OSX_ARCHITECTURES "i386;x86_64") - set(OSSIA_PCH 0) - else() - message(WARNING "macOS ${MACOS_SDK_VERSION} do not support building 32-bit anymore.") - endif() + set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64") endif() if(OSSIA_NO_QT) diff --git a/src/ossia-max/CMakeLists.txt b/src/ossia-max/CMakeLists.txt index 7111495dc44..6accb48420a 100644 --- a/src/ossia-max/CMakeLists.txt +++ b/src/ossia-max/CMakeLists.txt @@ -101,6 +101,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20) use_gold(${PROJECT_NAME}) add_linker_warnings_external(${PROJECT_NAME}) +ossia_set_visibility(${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME} PRIVATE ossia $:${MAXSDK_API_LIBRARY}>> diff --git a/src/ossia-max/src/ocue.cpp b/src/ossia-max/src/ocue.cpp index 7dd07579e14..24fdda48248 100644 --- a/src/ossia-max/src/ocue.cpp +++ b/src/ossia-max/src/ocue.cpp @@ -650,7 +650,7 @@ void ocue::explore(int argc, t_atom* argv) void ocue::select(int argc, t_atom* argv) { - invoke_mem_fun(argc, argv, [this](std::string_view name) { + invoke_mem_fun(argc, argv, [](std::string_view name) { }); } @@ -659,7 +659,7 @@ void ocue::select_model(int argc, t_atom* argv) { display_model(argc, argv); // Adds it / removes it from / to the selection - invoke_mem_fun(argc, argv, [this](std::string_view name) { + invoke_mem_fun(argc, argv, [](std::string_view name) { }); }