Compare commits

...
7 Commits
Author SHA1 Message Date
PPandGitHub 1002f57d63 add webgpu wasm (#284) 2022-09-01 15:48:30 +08:00
江战andGitHub 46fdcbcd46 Merge pull request #283 from PatriceJiang/v3.6.1-skip-unlinked-libraries
skip unused libraries
2022-08-24 16:40:40 +08:00
Patrice Jiang 39fd96b1df skip unused libraries 2022-08-24 16:39:27 +08:00
江战andGitHub 5fa7ac1890 Merge pull request #279 from PatriceJiang/v3.6.1-fix-ohos-freetype
HarmonyOS fix freetype include  path
2022-08-12 11:40:01 +08:00
Patrice Jiang 5fe18959ec fix freetype include path 2022-08-12 11:37:09 +08:00
timlyeeeandGitHub 9572c7b209 Compile glslang with xcode 12.4 (#277) 2022-07-29 13:45:30 +08:00
timlyeeeandGitHub ec0f635f89 recompile glslang to fix memory leaks on xcode 13.4, x86_64 (#276) 2022-07-27 15:46:09 +08:00
63 changed files with 18 additions and 9 deletions
+17 -9
View File
@@ -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.
+1
View File
@@ -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()