afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix android build error (#246)

This commit is contained in:
bofeng-song 2022-04-14 16:08:15 +08:00 committed by GitHub
parent e5e37407a3
commit dae690a354
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sources/Swappy/src/swappy/CMakeLists.txt
View File

@ -1,5 +1,4 @@
project(swappy C CXX) project(swappy C CXX)
set(CMAKE_CXX_STANDARD 14)
set(IgnoreOldToolchainWarning "${ANDROID_UNIFIED_HEADERS}") set(IgnoreOldToolchainWarning "${ANDROID_UNIFIED_HEADERS}")
# set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wthread-safety" ) # set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wthread-safety" )
@ -52,9 +51,9 @@ if (ANDROID_NDK_MAJOR GREATER 18)
endif() endif()
endif() endif()
add_custom_command(OUTPUT classes_dex.o add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/classes_dex.o
COMMAND cd ${CMAKE_CURRENT_LIST_DIR}/ && ${ANDROID_TOOLCHAIN_ROOT}/bin/ld.lld${ANDROID_TOOLCHAIN_SUFFIX} ${LINKER_TARGET_EMULATION_OPTION} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/classes_dex.o classes.dex COMMAND ${ANDROID_TOOLCHAIN_ROOT}/bin/ld.lld${ANDROID_TOOLCHAIN_SUFFIX} ${LINKER_TARGET_EMULATION_OPTION} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/classes_dex.o classes.dex
WORKING_DIRECTORY ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
) )
set_source_files_properties(SwappyDisplayManager set_source_files_properties(SwappyDisplayManager