Use EGL instead of GLX, and remove duplicate font names
This commit is contained in:
parent
5e8016b504
commit
e4efb2e78d
5 changed files with 32 additions and 14 deletions
|
|
@ -286,7 +286,7 @@ if((NOT EMSCRIPTEN) AND (NOT APPLE))
|
|||
endif()
|
||||
endif()
|
||||
|
||||
target_link_libraries(infinipaint SDL3::SDL3 zstd::libzstd_static)
|
||||
target_link_libraries(infinipaint zstd::libzstd_static)
|
||||
|
||||
if(EMSCRIPTEN)
|
||||
add_subdirectory(deps/datachannel-wasm EXCLUDE_FROM_ALL)
|
||||
|
|
@ -298,10 +298,9 @@ endif()
|
|||
if(NO_CONAN_BUILD)
|
||||
target_link_libraries(infinipaint ${SKIA_SVG_LIB} ${SKIA_RESOURCES_LIB} ${SKIA_LIB} ${SKIA_UNICODE_CORE_LIB} ${SKIA_UNICODE_ICU_LIB} ${SKIA_UNICODE_CORE_LIB} ${SKIA_PARAGRAPH_LIB} ${SKIA_SHAPER_LIB})
|
||||
target_include_directories(infinipaint PRIVATE ${SKIA_INCLUDE})
|
||||
target_link_libraries(infinipaint ICU::uc Fontconfig::Fontconfig Freetype::Freetype PNG::PNG ZLIB::ZLIB)
|
||||
target_link_libraries(infinipaint SDL3::SDL3 ICU::uc Fontconfig::Fontconfig Freetype::Freetype PNG::PNG ZLIB::ZLIB)
|
||||
else()
|
||||
target_link_libraries(infinipaint skia::skia)
|
||||
target_link_libraries(infinipaint icu::icu)
|
||||
target_link_libraries(infinipaint skia::skia sdl::sdl icu::icu)
|
||||
endif()
|
||||
|
||||
if(NOT EMSCRIPTEN)
|
||||
|
|
@ -309,7 +308,7 @@ if(NOT EMSCRIPTEN)
|
|||
endif()
|
||||
|
||||
if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX)
|
||||
target_link_libraries(infinipaint OpenGL::GLX)
|
||||
target_link_libraries(infinipaint OpenGL::EGL)
|
||||
endif()
|
||||
|
||||
if(GRAPHICS_BACKEND STREQUAL "Vulkan")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue