sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some Apple build inconsistencies

Browse source
This commit is contained in:
Paul Ferrand 2023-09-29 10:02:06 +02:00 • committed by Paul Ferrand
parent afc6dbaa3b
commit 3e2952b69b
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/SfizzConfig.cmake
View file

@ -87,7 +87,7 @@ endif()
if(NOT PROJECT_SYSTEM_PROCESSOR) if(NOT PROJECT_SYSTEM_PROCESSOR)
if(MSVC) if(MSVC)
set(PROJECT_SYSTEM_PROCESSOR "${MSVC_CXX_ARCHITECTURE_ID}" CACHE STRING "" FORCE) 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) set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "" FORCE)
else() else()
set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}" CACHE STRING "" FORCE) set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}" CACHE STRING "" FORCE)

3
external/st_audiofile/CMakeLists.txt vendored
View file

@ -29,6 +29,9 @@ set(WAVPACK_ENABLE_LIBCRYPTO OFF)
set(WAVPACK_INSTALL_CMAKE_MODULE OFF) set(WAVPACK_INSTALL_CMAKE_MODULE OFF)
set(WAVPACK_INSTALL_DOCS OFF) set(WAVPACK_INSTALL_DOCS OFF)
set(WAVPACK_INSTALL_PKGCONFIG_MODULE 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) add_subdirectory("thirdparty/wavpack" EXCLUDE_FROM_ALL)
target_link_libraries(st_audiofile_formats PUBLIC wavpack) target_link_libraries(st_audiofile_formats PUBLIC wavpack)