freetype is only used in DebugRenderer now, so link freetype only when DebugRenderer is enabled. (#268)
This commit is contained in:
parent
e16a3e115f
commit
a0a3c67d09
|
|
@ -4,11 +4,13 @@ set_target_properties(crypto PROPERTIES
|
||||||
IMPORTED_LOCATION ${platform_spec_path}/libcrypto.a
|
IMPORTED_LOCATION ${platform_spec_path}/libcrypto.a
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${platform_spec_path}/libfreetype.a
|
IMPORTED_LOCATION ${platform_spec_path}/libfreetype.a
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
|
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(jpeg STATIC IMPORTED GLOBAL)
|
add_library(jpeg STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(jpeg PROPERTIES
|
set_target_properties(jpeg PROPERTIES
|
||||||
|
|
@ -134,8 +136,13 @@ else()
|
||||||
set(PhysXSDK)
|
set(PhysXSDK)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
freetype
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
jpeg
|
jpeg
|
||||||
png
|
png
|
||||||
uv
|
uv
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,13 @@ set_target_properties(crypto PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcrypto.a
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcrypto.a
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(jpeg STATIC IMPORTED GLOBAL)
|
add_library(jpeg STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(jpeg PROPERTIES
|
set_target_properties(jpeg PROPERTIES
|
||||||
|
|
@ -194,8 +196,13 @@ list(APPEND CC_EXTERNAL_INCLUDES
|
||||||
${CMAKE_CURRENT_LIST_DIR}/include
|
${CMAKE_CURRENT_LIST_DIR}/include
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
freetype
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
jpeg
|
jpeg
|
||||||
png
|
png
|
||||||
webp
|
webp
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,13 @@ set_target_properties(crypto PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcrypto.a
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcrypto.a
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(jpeg STATIC IMPORTED GLOBAL)
|
add_library(jpeg STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(jpeg PROPERTIES
|
set_target_properties(jpeg PROPERTIES
|
||||||
|
|
@ -190,8 +192,13 @@ list(APPEND CC_EXTERNAL_INCLUDES
|
||||||
${CMAKE_CURRENT_LIST_DIR}/include
|
${CMAKE_CURRENT_LIST_DIR}/include
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
freetype
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
jpeg
|
jpeg
|
||||||
png
|
png
|
||||||
webp
|
webp
|
||||||
|
|
|
||||||
|
|
@ -105,11 +105,13 @@ set_target_properties(sdl2 PROPERTIES
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sdl2
|
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sdl2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${linux_lib_dir}/freetype/libfreetype.a
|
IMPORTED_LOCATION ${linux_lib_dir}/freetype/libfreetype.a
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
|
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
#glslang
|
#glslang
|
||||||
add_library(libGenericCodeGen STATIC IMPORTED GLOBAL)
|
add_library(libGenericCodeGen STATIC IMPORTED GLOBAL)
|
||||||
|
|
@ -150,6 +152,12 @@ list(APPEND CC_EXTERNAL_INCLUDES
|
||||||
${platform_spec_path}/include/uv
|
${platform_spec_path}/include/uv
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
uv
|
uv
|
||||||
vorbisfile
|
vorbisfile
|
||||||
|
|
@ -165,7 +173,6 @@ list(APPEND CC_EXTERNAL_LIBS
|
||||||
websockets
|
websockets
|
||||||
webp
|
webp
|
||||||
curl
|
curl
|
||||||
freetype
|
|
||||||
${optional_libs_name}
|
${optional_libs_name}
|
||||||
${glslang_libs_name}
|
${glslang_libs_name}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,13 @@ set_target_properties(curl PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcurl.a
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libcurl.a
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libfreetype.a
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(glfw3 STATIC IMPORTED GLOBAL)
|
add_library(glfw3 STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(glfw3 PROPERTIES
|
set_target_properties(glfw3 PROPERTIES
|
||||||
|
|
@ -185,8 +187,13 @@ else()
|
||||||
set(PhysXSDK)
|
set(PhysXSDK)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
freetype
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
jpeg
|
jpeg
|
||||||
png
|
png
|
||||||
webp
|
webp
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,12 @@ set_target_properties(crypto PROPERTIES
|
||||||
IMPORTED_LOCATION ${ohos_lib_dir}/libcrypto.a
|
IMPORTED_LOCATION ${ohos_lib_dir}/libcrypto.a
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${ohos_lib_dir}/libfreetype.a
|
IMPORTED_LOCATION ${ohos_lib_dir}/libfreetype.a
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(jpeg STATIC IMPORTED GLOBAL)
|
add_library(jpeg STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(jpeg PROPERTIES
|
set_target_properties(jpeg PROPERTIES
|
||||||
|
|
@ -163,8 +165,13 @@ if(USE_JOB_SYSTEM_TBB)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
freetype
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
jpeg
|
jpeg
|
||||||
png
|
png
|
||||||
webp
|
webp
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,14 @@ set_target_properties(dbgeng PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/dbgeng.dll
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/dbgeng.dll
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
add_library(freetype STATIC IMPORTED GLOBAL)
|
add_library(freetype STATIC IMPORTED GLOBAL)
|
||||||
|
|
||||||
set_target_properties(freetype PROPERTIES
|
set_target_properties(freetype PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/freetype.lib
|
||||||
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include/freetype
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(glew32 SHARED IMPORTED GLOBAL)
|
add_library(glew32 SHARED IMPORTED GLOBAL)
|
||||||
|
|
||||||
|
|
@ -235,8 +237,13 @@ else()
|
||||||
set(PhysXSDK)
|
set(PhysXSDK)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (USE_DEBUG_RENDERER)
|
||||||
list(APPEND CC_EXTERNAL_LIBS
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
freetype
|
freetype
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
list(APPEND CC_EXTERNAL_LIBS
|
||||||
glew32
|
glew32
|
||||||
iconv
|
iconv
|
||||||
crypto
|
crypto
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue