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

Merge pull request #83 from PatriceJiang/3d-add-cmake 

[3d] update CMakeLists.txt for CI
This commit is contained in:
Arnold 2020-04-14 14:07:41 +08:00 committed by GitHub
parent 16313b58e1 1a174df3a6
commit d91478657b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/CMakeLists.txt
View File

@ -51,6 +51,14 @@ set_target_properties(z PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/zlib
)
add_library(android_platform
${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
${CMAKE_ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c
)
target_include_directories(android_platform PUBLIC
${CMAKE_ANDROID_NDK}/sources/android/cpufeatures
${CMAKE_ANDROID_NDK}/sources/android/native_app_glue
)
set(se_libs_name)
@ -165,6 +173,7 @@ if(USE_SE_V8 AND USE_V8_DEBUGGER)
)
endif()
list(APPEND CC_EXTERNAL_LIBS
freetype
jpeg
@ -174,9 +183,13 @@ list(APPEND CC_EXTERNAL_LIBS
OpenSLES
${se_libs_name}
z
android_platform
)
list(APPEND CC_EXTERNAL_INCLUDES
${platform_spec_path}/include
${platform_spec_path}/include/v8
${platform_spec_path}/include/uv
${CMAKE_ANDROID_NDK}/sources/android/native_app_glue
)

17
cmake/CocosExternalConfig.cmake
View File

@ -1,22 +1,5 @@
# set friendly platform define
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(WINDOWS TRUE)
set(SYSTEM_STRING "Windows Desktop")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
set(ANDROID TRUE)
set(SYSTEM_STRING "Android")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(IOS)
set(APPLE TRUE)
set(SYSTEM_STRING "IOS")
else()
set(APPLE TRUE)
set(MACOSX TRUE)
set(SYSTEM_STRING "Mac OSX")
endif()
endif()
if(IOS)
set(platform_name ios)
set(platform_spec_path ios)

42
sources/CMakeLists.txt
View File

@ -20,6 +20,37 @@ set(CC_EXTERNAL_SROUCES
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyalloc.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyalloc.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarray.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarray.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblk.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblk.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblkof.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayblkof.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayof.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyarrayof.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommychain.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhash.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhash.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashdyn.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashdyn.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashlin.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashlin.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashtbl.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommyhashtbl.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommylist.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommylist.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytree.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytree.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrie.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrie.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrieinp.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytrieinp.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommytypes.h
)
if(ANDROID)
@ -31,16 +62,7 @@ if(ANDROID)
pvmp3dec
vorbisidec
)
if(ANDROID_NDK)
list(APPEND CC_EXTERNAL_SROUCES
${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
)
list(APPEND CC_EXTERNAL_INCLUDES
${ANDROID_NDK}/sources/android/cpufeatures
)
endif()
elseif(WINDOWS)
set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c PROPERTIES
LANGUAGE C

8
sources/SocketRocket/CMakeLists.txt
View File

@ -46,8 +46,12 @@ set(SOCKET_ROCKET_SOURCES
)
add_library(SocketRocket ${SOCKET_ROCKET_SOURCES})
cocos_mark_code_files(SocketRocket)
if(IOS)
set_property(TARGET SocketRocket PROPERTY XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${TARGET_IOS_VERSION})
set_property(TARGET SocketRocket PROPERTY XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
set_property(TARGET SocketRocket PROPERTY XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "YES")
endif()
source_group(TREE ${CMAKE_CURRENT_LIST_DIR} PREFIX "Source Files" FILES ${SOCKET_ROCKET_SOURCES})
target_include_directories(SocketRocket
PUBLIC ${CMAKE_CURRENT_LIST_DIR}

20
sources/pvmp3dec/CMakeLists.txt
View File

@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 3.8)
set(PVMP3SOURCE
${CMAKE_CURRENT_LIST_DIR}/src/pvmp3_normalize.cpp
${CMAKE_CURRENT_LIST_DIR}/src/pvmp3_alias_reduction.cpp
@ -31,10 +30,6 @@ set(PVMP3SOURCE
)
message(STATUS "-------------------abi for pvmp3:${ANDROID_ABI}------------------------------")
if("${ANDROID_ABI}" MATCHES "armeabi.*")
message(STATUS "pvmp3dec compile with asm")
set(PVMP3SOURCE_ASM
@ -56,9 +51,6 @@ else()
)
endif()
message(STATUS "pvmp3dec source list ->")
message(STATUS "${PVMP3SOURCE}")
add_library(pvmp3dec ${PVMP3SOURCE})
target_include_directories(pvmp3dec PUBLIC
@ -66,18 +58,10 @@ target_include_directories(pvmp3dec PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include
)
# set_target_properties(pvmp3dec
# PROPERTIES LINK_LANGUAGE ASM
# )
file(WRITE ${CMAKE_CURRENT_LIST_DIR}/def.h "#pragma once\n#define OSCL_UNUSED_ARG(x) (void)(x)")
# target_compile_definitions(pvmp3dec PRIVATE
# OSCL_UNUSED_ARG(x)=(void)(x)
# )
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h "#pragma once\n#define OSCL_UNUSED_ARG(x) (void)(x)")
target_compile_options(pvmp3dec PRIVATE
#-fsanitize=signed-integer-overflow
-include ${CMAKE_CURRENT_LIST_DIR}/def.h
-include ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h
#
)

12
sources/xxtea/xxtea.h
View File

@ -22,10 +22,14 @@
#include <stddef.h> /* for size_t & NULL declarations */
#if defined(_WIN32) && defined(_WINDOWS)
#if defined(_USRDLL)
#define XXTEA_DLL __declspec(dllexport)
#else /* use a DLL library */
#define XXTEA_DLL __declspec(dllimport)
#if CC_STATIC
#define XXTEA_DLL
#else
#if defined(_USRDLL)
#define XXTEA_DLL __declspec(dllexport)
#else /* use a DLL library */
#define XXTEA_DLL __declspec(dllimport)
#endif
#endif
#else
#define XXTEA_DLL

1
win32/CMakeLists.txt
View File

@ -154,6 +154,7 @@ add_library(OpenAL32 SHARED IMPORTED GLOBAL)
set_target_properties(OpenAL32 PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/OpenAL32.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/OpenAL32.lib
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/OpenalSoft
)
add_library(sqlite3 SHARED IMPORTED GLOBAL)