Skip to content
This repository was archived by the owner on Jun 21, 2026. It is now read-only.

Fixes for build errors when using CMake -G Xcode #1320

Open
geraintluff wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes for build errors when using CMake -G Xcode #1320

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
4 changes: 3 additions & 1 deletion cmake/SfizzConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ endif()
# Add required flags for the builds
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
gw_warn(-Wall -Wextra -Wno-multichar -Werror=return-type)
if(PROJECT_SYSTEM_PROCESSOR MATCHES "(i.86|x86_64)")
if(PROJECT_SYSTEM_PROCESSOR MATCHES "(i.86)")
add_compile_options(-msse2)
elseif(PROJECT_SYSTEM_PROCESSOR MATCHES "(x86_64)")
add_compile_options(-Xarch_x86_64 -msse2)
elseif(PROJECT_SYSTEM_PROCESSOR MATCHES "(arm.*)" AND NOT (PROJECT_SYSTEM_PROCESSOR MATCHES "(arm64)"))
add_compile_options(-mfpu=neon)
if(NOT ANDROID)
Expand Down
2 changes: 1 addition & 1 deletion cmake/SfizzSIMDSourceFiles.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ macro(sfizz_add_simd_sources SOURCES_VAR PREFIX)
${PREFIX}/sfizz/effects/impl/ResonantStringAVX.cpp
${PREFIX}/sfizz/effects/impl/ResonantArrayAVX.cpp
${PREFIX}/sfizz/simd/HelpersAVX.cpp
PROPERTIES COMPILE_FLAGS "-mavx")
PROPERTIES COMPILE_FLAGS "-Xarch_x86_64 -mavx")
endif()
endif()
endmacro()
8 changes: 4 additions & 4 deletions external/atomic_queue/include/atomic_queue/atomic_queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,13 @@ class AtomicQueue2 : public AtomicQueueCommon<AtomicQueue2<T, SIZE, MINIMIZE_CON

T do_pop(unsigned tail) noexcept {
unsigned index = details::remap_index<SHUFFLE_BITS>(tail % size_);
return Base::template do_pop_any(states_[index], elements_[index]);
return Base::do_pop_any(states_[index], elements_[index]);
}

template<class U>
void do_push(U&& element, unsigned head) noexcept {
unsigned index = details::remap_index<SHUFFLE_BITS>(head % size_);
Base::template do_push_any(std::forward<U>(element), states_[index], elements_[index]);
Base::do_push_any(std::forward<U>(element), states_[index], elements_[index]);
}

public:
Expand Down Expand Up @@ -529,13 +529,13 @@ class AtomicQueueB2 : private std::allocator_traits<A>::template rebind_alloc<un

T do_pop(unsigned tail) noexcept {
unsigned index = details::remap_index<SHUFFLE_BITS>(tail & (size_ - 1));
return Base::template do_pop_any(states_[index], elements_[index]);
return Base::do_pop_any(states_[index], elements_[index]);
}

template<class U>
void do_push(U&& element, unsigned head) noexcept {
unsigned index = details::remap_index<SHUFFLE_BITS>(head & (size_ - 1));
Base::template do_push_any(std::forward<U>(element), states_[index], elements_[index]);
Base::do_push_any(std::forward<U>(element), states_[index], elements_[index]);
}

template<class U>
Expand Down