Compare commits
10
Commits
v3d-gfx-125
...
v3.6.1-2
| Author | SHA1 | Date | |
|---|---|---|---|
  PPandGitHub
|
1002f57d63 | ||
 江战andGitHub
|
46fdcbcd46 | ||
 Patrice Jiang
|
39fd96b1df | ||
|
江战andGitHub
|
5fa7ac1890 | ||
|
Patrice Jiang
|
5fe18959ec | ||
 timlyeeeandGitHub
|
9572c7b209 | ||
|
timlyeeeandGitHub
|
ec0f635f89 | ||
 yangchaoandGitHub
|
9fdaeaa984 | ||
|
江战andGitHub
|
458a4b5473 | ||
|
Patrice Jiang
|
807419565f |
+17
-9
@@ -76,6 +76,7 @@ if(USE_SE_V8)
|
||||
add_library(v8_monolith STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(v8_monolith PROPERTIES
|
||||
IMPORTED_LOCATION ${platform_spec_path}/v8/libv8_monolith.a
|
||||
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
|
||||
)
|
||||
|
||||
if(ANDROID_ABI STREQUAL "arm64-v8a" OR ANDROID_ABI STREQUAL "x86_64")
|
||||
@@ -92,7 +93,7 @@ if(USE_SE_V8)
|
||||
set(se_libs_name v8_monolith v8_inspector)
|
||||
endif()
|
||||
|
||||
if(USE_SOCKET)
|
||||
if(USE_WEBSOCKET_SERVER)
|
||||
list(APPEND CC_EXTERNAL_LIBS
|
||||
websockets
|
||||
ssl
|
||||
@@ -100,19 +101,19 @@ if(USE_SOCKET)
|
||||
)
|
||||
endif()
|
||||
|
||||
if(USE_SE_V8 AND USE_V8_DEBUGGER)
|
||||
if(USE_SE_V8 AND USE_V8_DEBUGGER )
|
||||
list(APPEND CC_EXTERNAL_LIBS
|
||||
v8_inspector
|
||||
)
|
||||
endif()
|
||||
|
||||
############################# glslang #############################
|
||||
|
||||
set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen)
|
||||
foreach(lib IN LISTS glslang_libs_name)
|
||||
add_library(${lib} STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(${lib} PROPERTIES
|
||||
IMPORTED_LOCATION ${platform_spec_path}/glslang/lib${lib}.a
|
||||
# INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/glslang
|
||||
)
|
||||
endforeach()
|
||||
|
||||
@@ -145,14 +146,24 @@ endif()
|
||||
list(APPEND CC_EXTERNAL_LIBS
|
||||
jpeg
|
||||
png
|
||||
uv
|
||||
webp
|
||||
uv
|
||||
android_platform
|
||||
${glslang_libs_name}
|
||||
${tbb_libs_name}
|
||||
${PhysXSDK}
|
||||
)
|
||||
|
||||
if(USE_JOB_SYSTEM_TBB OR CC_USE_VULKAN) ## VKDevice.cpp use tbb_allocator.h
|
||||
list(APPEND CC_EXTERNAL_LIBS
|
||||
${tbb_libs_name}
|
||||
)
|
||||
endif()
|
||||
|
||||
if(CC_USE_VULKAN)
|
||||
list(APPEND CC_EXTERNAL_LIBS
|
||||
${glslang_libs_name}
|
||||
)
|
||||
endif()
|
||||
|
||||
set(ZLIB z)
|
||||
if(NOT USE_MODULES)
|
||||
list(APPEND CC_EXTERNAL_LIBS ${ZLIB} ${se_libs_name})
|
||||
@@ -162,8 +173,5 @@ endif()
|
||||
|
||||
list(APPEND CC_EXTERNAL_INCLUDES
|
||||
${platform_spec_path}/include
|
||||
${platform_spec_path}/include/v8
|
||||
${platform_spec_path}/include/uv
|
||||
${platform_spec_path}/include/glslang
|
||||
${CMAKE_ANDROID_NDK}/sources/android/native_app_glue
|
||||
)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -10,6 +10,7 @@ if (USE_DEBUG_RENDERER)
|
||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(freetype PROPERTIES
|
||||
IMPORTED_LOCATION ${ohos_lib_dir}/libfreetype.a
|
||||
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -164,8 +164,8 @@ if(CC_EDITOR)
|
||||
elseif(USE_SE_V8)
|
||||
add_library(v8 SHARED IMPORTED GLOBAL)
|
||||
set_target_properties(v8 PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8.dll
|
||||
IMPORTED_IMPLIB_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8.dll.lib
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8.dll
|
||||
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8.dll.lib
|
||||
IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8.dll
|
||||
IMPORTED_IMPLIB_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8.dll.lib
|
||||
INTERFACE_COMPILE_DEFINITIONS V8_COMPRESS_POINTERS
|
||||
@@ -173,16 +173,16 @@ elseif(USE_SE_V8)
|
||||
|
||||
add_library(v8_libbase SHARED IMPORTED GLOBAL)
|
||||
set_target_properties(v8_libbase PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libbase.dll
|
||||
IMPORTED_IMPLIB_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libbase.dll.lib
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libbase.dll
|
||||
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libbase.dll.lib
|
||||
IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libbase.dll
|
||||
IMPORTED_IMPLIB_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libbase.dll.lib
|
||||
)
|
||||
|
||||
add_library(v8_libplatform SHARED IMPORTED GLOBAL)
|
||||
set_target_properties(v8_libplatform PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libplatform.dll
|
||||
IMPORTED_IMPLIB_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libplatform.dll.lib
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libplatform.dll
|
||||
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/v8/release/v8_libplatform.dll.lib
|
||||
IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libplatform.dll
|
||||
IMPORTED_IMPLIB_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/v8/debug/v8_libplatform.dll.lib
|
||||
)
|
||||
@@ -205,7 +205,7 @@ foreach(gl IN LISTS glslang_libs_name)
|
||||
add_library(${gl} STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(${gl} PROPERTIES
|
||||
IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}d.lib
|
||||
IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
|
||||
)
|
||||
endforeach()
|
||||
|
||||
@@ -226,7 +226,7 @@ if(USE_PHYSICS_PHYSX)
|
||||
add_library(${PX} STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(${PX} PROPERTIES
|
||||
IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/debug/${PX}_static_64.lib
|
||||
IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_64.lib
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/PhysX/release/${PX}_static_64.lib
|
||||
)
|
||||
endforeach()
|
||||
else()
|
||||
|
||||
Reference in New Issue
Block a user