diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index c7445df3..9bf3df61 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -4,11 +4,13 @@ set_target_properties(crypto PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libcrypto.a ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libfreetype.a INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype ) +endif() add_library(jpeg STATIC IMPORTED GLOBAL) set_target_properties(jpeg PROPERTIES @@ -134,8 +136,13 @@ else() set(PhysXSDK) endif() +if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype +) +endif() + +list(APPEND CC_EXTERNAL_LIBS jpeg png uv diff --git a/ios-m1-simulator/CMakeLists.txt b/ios-m1-simulator/CMakeLists.txt index 5f8583b5..266a1fbb 100644 --- a/ios-m1-simulator/CMakeLists.txt +++ b/ios-m1-simulator/CMakeLists.txt @@ -4,11 +4,13 @@ set_target_properties(crypto PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcrypto.a ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype ) +endif() add_library(jpeg STATIC IMPORTED GLOBAL) set_target_properties(jpeg PROPERTIES @@ -194,8 +196,13 @@ list(APPEND CC_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/include ) +if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype +) +endif() + +list(APPEND CC_EXTERNAL_LIBS jpeg png webp diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index 060a0b88..524583d0 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -4,11 +4,13 @@ set_target_properties(crypto PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcrypto.a ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype ) +endif() add_library(jpeg STATIC IMPORTED GLOBAL) set_target_properties(jpeg PROPERTIES @@ -190,8 +192,13 @@ list(APPEND CC_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/include ) +if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype +) +endif() + +list(APPEND CC_EXTERNAL_LIBS jpeg png webp diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 4637ea46..856f66ad 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -105,11 +105,13 @@ set_target_properties(sdl2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sdl2 ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${linux_lib_dir}/freetype/libfreetype.a INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype ) +endif() #glslang add_library(libGenericCodeGen STATIC IMPORTED GLOBAL) @@ -150,6 +152,12 @@ list(APPEND CC_EXTERNAL_INCLUDES ${platform_spec_path}/include/uv ) +if (USE_DEBUG_RENDERER) +list(APPEND CC_EXTERNAL_LIBS + freetype +) +endif() + list(APPEND CC_EXTERNAL_LIBS uv vorbisfile @@ -165,7 +173,6 @@ list(APPEND CC_EXTERNAL_LIBS websockets webp curl - freetype ${optional_libs_name} ${glslang_libs_name} ) diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index b6bb1705..d4edb285 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -9,11 +9,13 @@ set_target_properties(curl PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcurl.a ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype ) +endif() add_library(glfw3 STATIC IMPORTED GLOBAL) set_target_properties(glfw3 PROPERTIES @@ -185,8 +187,13 @@ else() set(PhysXSDK) endif() +if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype +) +endif() + +list(APPEND CC_EXTERNAL_LIBS jpeg png webp diff --git a/ohos/CMakeLists.txt b/ohos/CMakeLists.txt index be7364b6..67357ef6 100644 --- a/ohos/CMakeLists.txt +++ b/ohos/CMakeLists.txt @@ -6,10 +6,12 @@ set_target_properties(crypto PROPERTIES IMPORTED_LOCATION ${ohos_lib_dir}/libcrypto.a ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${ohos_lib_dir}/libfreetype.a ) +endif() add_library(jpeg STATIC IMPORTED GLOBAL) set_target_properties(jpeg PROPERTIES @@ -163,8 +165,13 @@ if(USE_JOB_SYSTEM_TBB) ) endif() +if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype +) +endif() + +list(APPEND CC_EXTERNAL_LIBS jpeg png webp diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index 45ae9c6d..6ab26746 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -16,12 +16,14 @@ set_target_properties(dbgeng PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/dbgeng.dll ) +if (USE_DEBUG_RENDERER) add_library(freetype STATIC IMPORTED GLOBAL) set_target_properties(freetype PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype ) +endif() add_library(glew32 SHARED IMPORTED GLOBAL) @@ -235,8 +237,13 @@ else() set(PhysXSDK) endif() +if (USE_DEBUG_RENDERER) list(APPEND CC_EXTERNAL_LIBS freetype +) +endif() + +list(APPEND CC_EXTERNAL_LIBS glew32 iconv crypto