Attempt 3

musescore · Aug 13, 2024 · 1f8736a · 1f8736a
1 parent cf0a5a6
commit 1f8736a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/buildscripts/cmake/SetupBuildEnvironment.cmake b/buildscripts/cmake/SetupBuildEnvironment.cmake
@@ -10,6 +10,10 @@ set(CMAKE_UNITY_BUILD_BATCH_SIZE 12)
 if (CC_IS_GCC)
     message(STATUS "Using Compiler GCC ${CMAKE_CXX_COMPILER_VERSION}")
 
+    if (ARCH_IS_ARMV7L)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon")
+    endif()
     set(CMAKE_CXX_FLAGS_DEBUG   "-g")
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
@@ -65,6 +69,10 @@ elseif(CC_IS_MINGW)
 elseif(CC_IS_CLANG)
     message(STATUS "Using Compiler CLANG ${CMAKE_CXX_COMPILER_VERSION}")
 
+    if (ARCH_IS_ARMV7L)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon")
+    endif()
     set(CMAKE_CXX_FLAGS_DEBUG   "-g")
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 

diff --git a/src/framework/audio/thirdparty/opusenc/cmake/SetupOpus.cmake b/src/framework/audio/thirdparty/opusenc/cmake/SetupOpus.cmake
@@ -38,11 +38,6 @@ if (MUE_COMPILE_USE_SYSTEM_OPUS)
     message(WARNING "Set MUE_COMPILE_USE_SYSTEM_OPUS=ON, but system opus not found, built-in will be used")
 endif ()
 
-include(GetPlatformInfo)
-if (ARCH_IS_ARMV7L)
-    target_compile_options(opus PRIVATE -mfpu=neon)
-endif()
-
 set(OPUS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../opus/opus-1.4)
 add_subdirectory(${OPUS_LIB_DIR} opus)