Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some Apple build inconsistencies #1190

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Fix some Apple build inconsistencies #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/SfizzConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ endif()
if(NOT PROJECT_SYSTEM_PROCESSOR)
if(MSVC)
set(PROJECT_SYSTEM_PROCESSOR "${MSVC_CXX_ARCHITECTURE_ID}" CACHE STRING "" FORCE)
elseif(CMAKE_OSX_ARCHITECTURES)
elseif(APPLE AND CMAKE_OSX_ARCHITECTURES)
set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "" FORCE)
else()
set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}" CACHE STRING "" FORCE)
Expand Down
3 changes: 3 additions & 0 deletions external/st_audiofile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ set(WAVPACK_ENABLE_LIBCRYPTO OFF)
set(WAVPACK_INSTALL_CMAKE_MODULE OFF)
set(WAVPACK_INSTALL_DOCS OFF)
set(WAVPACK_INSTALL_PKGCONFIG_MODULE OFF)
if(PROJECT_SYSTEM_PROCESSOR MATCHES "(arm.*)")
SET(WAVPACK_ENABLE_ASM OFF)
endif()

add_subdirectory("thirdparty/wavpack" EXCLUDE_FROM_ALL)
target_link_libraries(st_audiofile_formats PUBLIC wavpack)
Expand Down