Update RmlUi for gap property in flexbox

This commit is contained in:
Mr-Wiseguy 2025-01-17 00:16:58 -05:00
parent 268b392823
commit 5dc37e6c05
3 changed files with 11 additions and 4 deletions

View File

@ -37,7 +37,7 @@ set(BUILD_SHARED_LIBS OFF)
SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg)
# set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
SET(ENABLE_SVG_PLUGIN ON CACHE BOOL "" FORCE)
SET(RMLUI_SVG_PLUGIN ON CACHE BOOL "" FORCE)
SET(RMLUI_TESTS_ENABLED OFF CACHE BOOL "" FORCE)
add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi)
@ -317,8 +317,8 @@ target_link_libraries(Zelda64Recompiled PRIVATE
librecomp
ultramodern
rt64
RmlCore
RmlDebugger
RmlUi::Core
RmlUi::Debugger
nfd
lunasvg
)

View File

@ -1,2 +1,9 @@
set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include)
set(FREETYPE_LIBRARIES "${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/release static/vs2015-2022/win64/freetype.lib")
add_library(Freetype::Freetype STATIC IMPORTED)
set_target_properties(Freetype::Freetype PROPERTIES
IMPORTED_LOCATION ${FREETYPE_LIBRARIES}
)
target_include_directories(Freetype::Freetype INTERFACE
${FREETYPE_INCLUDE_DIRS}
)

@ -1 +1 @@
Subproject commit a893ea6386e0c842f90a726a53c9b9e888797519
Subproject commit b5bf23ddde92dc5bdbf3ab949cbab512fe866b31