diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index c2e855c..3058fd3 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -9,7 +9,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set (RLOTTIE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../dependency/rlottie) set (PIXMAN_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../dependency/pixman) -set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp") if (RLOTTIE_IOS) set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE NO) @@ -39,27 +38,20 @@ else() add_library (LottiePlugin SHARED ${RLOTTIE_PLUGIN_LIBRARY_SOURCES}) endif() -if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") - enable_language(ASM) -endif() - if (ANDROID) if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a") - message("Compile asm source for armv7-a") - target_compile_options(rlottie PUBLIC -fno-integrated-as) + message("Compile cpp source for armv7-a") target_compile_definitions(rlottie PUBLIC USE_ARM_NEON) target_sources(rlottie PRIVATE ${PIXMAN_ROOT}/pixman-arm-intrisics.cpp) elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") - message("Compile asm source for aarch64") - target_compile_options(rlottie PUBLIC -fno-integrated-as) + message("Compile cpp source for aarch64") target_compile_definitions(rlottie PUBLIC USE_ARM_NEON __ARM64_NEON__) target_sources(rlottie PRIVATE ${PIXMAN_ROOT}/pixman-arm-intrisics.cpp) endif() endif() if (RLOTTIE_IOS) - message("Compile asm source for iOS") - target_compile_options(rlottie PUBLIC -fno-integrated-as) + message("Compile cpp source for iOS") target_compile_definitions(rlottie PUBLIC USE_ARM_NEON __ARM64_NEON__ __ARM_NEON__) target_sources(rlottie PRIVATE ${PIXMAN_ROOT}/pixman-arm-intrisics.cpp) endif()