merge from dev

This commit is contained in:
daanx 2024-12-08 09:15:09 -08:00
commit 36bb599873

View file

@ -407,9 +407,9 @@ if (MSVC AND MSVC_VERSION GREATER_EQUAL 1914) # vs2017+
list(APPEND mi_cflags /Zc:__cplusplus)
if(MI_OPT_ARCH)
if(MI_ARCH STREQUAL "x64")
set(MI_OPT_ARCH_FLAGS "/arch:AVX2") # fast bit scan (since 2013)
set(MI_OPT_ARCH_FLAGS "/arch:AVX2")
elseif(MI_ARCH STREQUAL "arm64")
set(MI_OPT_ARCH_FLAGS "/arch:armv8.1") # fast atomics (since 2016)
set(MI_OPT_ARCH_FLAGS "/arch:armv8.1")
endif()
endif()
endif()