diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index b287f29f92..d50d1b20bd 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -476,10 +476,13 @@ endif() qt_internal_extend_target(Core CONDITION ( TEST_architecture_arch STREQUAL i386 ) OR - ( TEST_architecture_arch STREQUAL x86_64 ) + ( TEST_architecture_arch STREQUAL x86_64 ) OR + ( CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" ) OR + ( CMAKE_OSX_ARCHITECTURES MATCHES "i386" ) OR SOURCES global/qsimd_x86_p.h ) + qt_internal_extend_target(Core CONDITION ANDROID SOURCES kernel/qsharedmemory_android.cpp diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h index 093fc3aedc..55eeda2f59 100644 --- a/src/corelib/global/qsimd_p.h +++ b/src/corelib/global/qsimd_p.h @@ -213,7 +213,7 @@ asm( # include # endif -# include "qsimd_x86_p.h" +# include // x86-64 sub-architecture version 3 //