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

V3.3 modularize (#163) 

* seperate modules

* sep

* add include directory

* remove unused
This commit is contained in:
江战 2021-07-28 15:45:33 +08:00 committed by GitHub
parent 07da055844
commit e119cc2d0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 69 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/CMakeLists.txt
View File

@ -84,8 +84,8 @@ if(USE_SE_V8)
add_library(v8_inspector STATIC IMPORTED GLOBAL) add_library(v8_inspector STATIC IMPORTED GLOBAL)
set_target_properties(v8_inspector PROPERTIES set_target_properties(v8_inspector PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
) )
set(se_libs_name v8_monolith v8_inspector) set(se_libs_name v8_monolith v8_inspector)
endif() endif()
@ -157,14 +157,18 @@ list(APPEND CC_EXTERNAL_LIBS
png png
uv uv
webp webp
${se_libs_name}
z
android_platform android_platform
${glslang_libs_name} ${glslang_libs_name}
${tbb_libs_name} ${tbb_libs_name}
${PhysXSDK} ${PhysXSDK}
) )
set(ZLIB z)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${ZLIB} ${se_libs_name})
endif()
list(APPEND CC_EXTERNAL_INCLUDES list(APPEND CC_EXTERNAL_INCLUDES
${platform_spec_path}/include ${platform_spec_path}/include

6
ios-m1-simulator/CMakeLists.txt
View File

@ -170,7 +170,6 @@ list(APPEND CC_EXTERNAL_LIBS
jpeg jpeg
png png
webp webp
${se_libs_name}
crypto crypto
ssl ssl
${glslang_libs_name} ${glslang_libs_name}
@ -178,3 +177,8 @@ list(APPEND CC_EXTERNAL_LIBS
${tbb_libs_name} ${tbb_libs_name}
${PhysXSDK} ${PhysXSDK}
) )
set(ZLIB z)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${se_libs_name})
endif()

7
ios/CMakeLists.txt
View File

@ -165,7 +165,6 @@ list(APPEND CC_EXTERNAL_LIBS
jpeg jpeg
png png
webp webp
${se_libs_name}
crypto crypto
ssl ssl
${glslang_libs_name} ${glslang_libs_name}
@ -173,3 +172,9 @@ list(APPEND CC_EXTERNAL_LIBS
${tbb_libs_name} ${tbb_libs_name}
${PhysXSDK} ${PhysXSDK}
) )
set(ZLIB z)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${se_libs_name})
endif()

8
mac/CMakeLists.txt
View File

@ -164,16 +164,20 @@ list(APPEND CC_EXTERNAL_LIBS
png png
webp webp
curl curl
${se_libs_name}
crypto crypto
ssl ssl
z
${glslang_libs_name} ${glslang_libs_name}
${spirv-cross_libs_name} ${spirv-cross_libs_name}
${tbb_libs_name} ${tbb_libs_name}
${PhysXSDK} ${PhysXSDK}
) )
set(ZLIB z)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${ZLIB} ${se_libs_name})
endif()
list(APPEND CC_EXTERNAL_INCLUDES list(APPEND CC_EXTERNAL_INCLUDES
${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_LIST_DIR}/include
) )

8
ohos/CMakeLists.txt
View File

@ -101,6 +101,7 @@ if(USE_SE_V8)
add_library(v8_inspector STATIC IMPORTED GLOBAL) add_library(v8_inspector STATIC IMPORTED GLOBAL)
set_target_properties(v8_inspector PROPERTIES set_target_properties(v8_inspector PROPERTIES
IMPORTED_LOCATION ${ohos_lib_dir}/libinspector.a IMPORTED_LOCATION ${ohos_lib_dir}/libinspector.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
) )
set(se_libs_name v8_monolith v8_inspector) set(se_libs_name v8_monolith v8_inspector)
@ -144,7 +145,6 @@ set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV glslang-default-reso
list(APPEND CC_EXTERNAL_LIBS list(APPEND CC_EXTERNAL_LIBS
z
freetype freetype
jpeg jpeg
png png
@ -156,6 +156,12 @@ list(APPEND CC_EXTERNAL_LIBS
mpg123 mpg123
) )
set(ZLIB z)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${ZLIB})
endif()
if(USE_V8_DEBUGGER OR USE_WEBSOCKET_SERVER) if(USE_V8_DEBUGGER OR USE_WEBSOCKET_SERVER)
list(APPEND CC_EXTERNAL_LIBS list(APPEND CC_EXTERNAL_LIBS
uv uv

32
sources/CMakeLists.txt
View File

@ -1,13 +1,6 @@
set(CC_UNZIP_SOURCES
set(CC_EXTERNAL_SOURCES
${CMAKE_CURRENT_LIST_DIR}/tinyxml2/tinyxml2.cpp
${CMAKE_CURRENT_LIST_DIR}/tinyxml2/tinyxml2.h
${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
${CMAKE_CURRENT_LIST_DIR}/unzip/crypt.h ${CMAKE_CURRENT_LIST_DIR}/unzip/crypt.h
${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi.cpp ${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi.cpp
${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi.h ${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi.h
@ -15,15 +8,38 @@ set(CC_EXTERNAL_SOURCES
${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi_mem.h ${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi_mem.h
${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.cpp ${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.cpp
${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.h ${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.h
)
set(CC_TINYDIR_SOURCES
${CMAKE_CURRENT_LIST_DIR}/tinyxml2/tinyxml2.cpp
${CMAKE_CURRENT_LIST_DIR}/tinyxml2/tinyxml2.h
${CMAKE_CURRENT_LIST_DIR}/tinydir/tinydir.h
)
set(CC_FS_SOURCES
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp
)
set(CC_EXTERNAL_SOURCES
${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h
) )
if(USE_MODULES)
list(APPEND CC_EXTERNAL_SOURCES
${CC_UNZIP_SOURCES}
${CC_TINYDIR_SOURCES}
${CC_FS_SOURCES}
)
endif()
if(ANDROID OR OHOS) if(ANDROID OR OHOS)
include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt)

10
win32/CMakeLists.txt
View File

@ -273,8 +273,6 @@ list(APPEND CC_EXTERNAL_LIBS
webp webp
OpenAL32 OpenAL32
sqlite3 sqlite3
${se_libs_name}
zlib
websockets websockets
SDL2 SDL2
SDL2Main SDL2Main
@ -284,6 +282,14 @@ list(APPEND CC_EXTERNAL_LIBS
) )
set(ZLIB zlib)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${ZLIB}
${se_libs_name}
)
endif()
list(APPEND CC_EXTERNAL_INCLUDES list(APPEND CC_EXTERNAL_INCLUDES
${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_LIST_DIR}/include
) )

7
win64/CMakeLists.txt
View File

@ -294,7 +294,6 @@ list(APPEND CC_EXTERNAL_LIBS
webp webp
OpenAL32 OpenAL32
sqlite3 sqlite3
${se_libs_name}
zlib zlib
websockets websockets
SDL2 SDL2
@ -304,6 +303,12 @@ list(APPEND CC_EXTERNAL_LIBS
${PhysXSDK} ${PhysXSDK}
) )
set(ZLIB zlib)
if(NOT USE_MODULES)
list(APPEND CC_EXTERNAL_LIBS ${ZLIB}
${se_libs_name}
)
endif()
list(APPEND CC_EXTERNAL_INCLUDES list(APPEND CC_EXTERNAL_INCLUDES
${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_LIST_DIR}/include