mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 11:38:58 +08:00
[rmlui] Update to version 5.1 (#30904)
This commit is contained in:
parent
e4c66a59d9
commit
acbf376ab2
@ -1,20 +1,20 @@
|
|||||||
diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake
|
diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake
|
||||||
index 9c3042c..c3820df 100644
|
index cd2918a7..f063a879 100644
|
||||||
--- a/CMake/FileList.cmake
|
--- a/CMake/FileList.cmake
|
||||||
+++ b/CMake/FileList.cmake
|
+++ b/CMake/FileList.cmake
|
||||||
@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES
|
@@ -123,7 +123,6 @@ set(Core_PUB_HDR_FILES
|
||||||
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h
|
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h
|
||||||
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp
|
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_map.hpp
|
||||||
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp
|
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/itlib/flat_set.hpp
|
||||||
- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h
|
- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h
|
||||||
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h
|
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h
|
||||||
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h
|
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h
|
||||||
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h
|
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 62432f1..d9287c9 100644
|
index 0b552524..190e8c8e 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN )
|
@@ -427,6 +427,8 @@ if( ENABLE_SVG_PLUGIN )
|
||||||
message("-- Can SVG plugin be enabled - yes - lunasvg library found")
|
message("-- Can SVG plugin be enabled - yes - lunasvg library found")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -24,13 +24,13 @@ index 62432f1..d9287c9 100644
|
|||||||
if(NOT BUILD_FRAMEWORK)
|
if(NOT BUILD_FRAMEWORK)
|
||||||
#===================================
|
#===================================
|
||||||
diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h
|
diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h
|
||||||
index dc42753..5249e1d 100644
|
index 018ab3b1..4bc20613 100644
|
||||||
--- a/Include/RmlUi/Config/Config.h
|
--- a/Include/RmlUi/Config/Config.h
|
||||||
+++ b/Include/RmlUi/Config/Config.h
|
+++ b/Include/RmlUi/Config/Config.h
|
||||||
@@ -57,7 +57,7 @@
|
@@ -57,7 +57,7 @@
|
||||||
#else
|
#else
|
||||||
#include "../Core/Containers/chobo/flat_map.hpp"
|
#include "../Core/Containers/itlib/flat_map.hpp"
|
||||||
#include "../Core/Containers/chobo/flat_set.hpp"
|
#include "../Core/Containers/itlib/flat_set.hpp"
|
||||||
-#include "../Core/Containers/robin_hood.h"
|
-#include "../Core/Containers/robin_hood.h"
|
||||||
+#include <robin_hood.h>
|
+#include <robin_hood.h>
|
||||||
#endif // RMLUI_NO_THIRDPARTY_CONTAINERS
|
#endif // RMLUI_NO_THIRDPARTY_CONTAINERS
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO mikke89/RmlUi
|
REPO mikke89/RmlUi
|
||||||
REF 5.0
|
REF 5.1
|
||||||
SHA512 10136893eb695b098fe6d718e23ce331c549faf3eb73413a5bb143ddd3601726b8bc42382c4e575d2abfff838ad3e6af1d4945426223a9c6f0fd048b481819dd
|
SHA512 06bf1a24c6ff3f164ef1af80186d5f974e6a5467f6f0d50ec33bb14516e4899321fe7a5b9c4912def908a53711bf302bc782cf78117e0930862f5d1ad07dec18
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
add-robin-hood.patch
|
add-robin-hood.patch
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "rmlui",
|
"name": "rmlui",
|
||||||
"version": "5.0",
|
"version": "5.1",
|
||||||
"maintainers": "Michael R. P. Ragazzon <mikke89@users.noreply.github.com>",
|
"maintainers": "Michael R. P. Ragazzon <mikke89@users.noreply.github.com>",
|
||||||
"description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.",
|
"description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.",
|
||||||
"homepage": "https://github.com/mikke89/RmlUi",
|
"homepage": "https://github.com/mikke89/RmlUi",
|
||||||
|
@ -7001,7 +7001,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"rmlui": {
|
"rmlui": {
|
||||||
"baseline": "5.0",
|
"baseline": "5.1",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"roaring": {
|
"roaring": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "eef365a991fcf66a1848ed65bb9af75e767ffce6",
|
||||||
|
"version": "5.1",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "7938b94aadfdba5af77643ebec4d36a7e6037e29",
|
"git-tree": "7938b94aadfdba5af77643ebec4d36a7e6037e29",
|
||||||
"version": "5.0",
|
"version": "5.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user