seperate modules

This commit is contained in:
Arnold 2021-07-27 17:54:52 +08:00
parent 07da055844
commit 82ab4e04ca
10 changed files with 93 additions and 20 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,13 +1,6 @@
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
set(CC_UNZIP_SOURCES
${CMAKE_CURRENT_LIST_DIR}/unzip/crypt.h
${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi.cpp
${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi.h
@ -15,6 +8,19 @@ set(CC_EXTERNAL_SOURCES
${CMAKE_CURRENT_LIST_DIR}/unzip/ioapi_mem.h
${CMAKE_CURRENT_LIST_DIR}/unzip/unzip.cpp
${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_EXTERNAL_SOURCES
${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
@ -24,6 +30,13 @@ set(CC_EXTERNAL_SOURCES
${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h
)
if(USE_MODULES)
list(APPEND CC_EXTERNAL_SOURCES
${CC_UNZIP_SOURCES}
${CC_TINYDIR_SOURCES}
)
endif()
if(ANDROID OR OHOS)
include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt)

View File

@ -0,0 +1,13 @@
####################
# add include headers to IDE
file(GLOB include_files
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"*.hpp"
)
add_custom_target(safe_numerics SOURCES ${include_files})
add_subdirectory("concept")
# end headers in IDE
####################

View File

@ -0,0 +1,14 @@
####################
# add include headers to IDE
set(USE_FOLDERS TRUE)
file(GLOB include_files
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
)
add_custom_target(concepts SOURCES ${include_files})
set_target_properties(concepts PROPERTIES FOLDER "safe_numerics")
# end headers in IDE
####################

View File

@ -273,8 +273,6 @@ list(APPEND CC_EXTERNAL_LIBS
webp
OpenAL32
sqlite3
${se_libs_name}
zlib
websockets
SDL2
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
${CMAKE_CURRENT_LIST_DIR}/include
)

View File

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