early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,38 @@
diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake
index 9c3042c..c3820df 100644
--- a/CMake/FileList.cmake
+++ b/CMake/FileList.cmake
@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES
${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/chobo/flat_set.hpp
- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h
${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62432f1..d9287c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN )
message("-- Can SVG plugin be enabled - yes - lunasvg library found")
endif()
+find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h)
+include_directories(${ROBIN_HOOD_INCLUDE_DIR})
if(NOT BUILD_FRAMEWORK)
#===================================
diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h
index dc42753..5249e1d 100644
--- a/Include/RmlUi/Config/Config.h
+++ b/Include/RmlUi/Config/Config.h
@@ -57,7 +57,7 @@
#else
#include "../Core/Containers/chobo/flat_map.hpp"
#include "../Core/Containers/chobo/flat_set.hpp"
-#include "../Core/Containers/robin_hood.h"
+#include <robin_hood.h>
#endif // RMLUI_NO_THIRDPARTY_CONTAINERS
namespace Rml {

56
externals/vcpkg/ports/rmlui/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,56 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mikke89/RmlUi
REF 4.4
SHA512 b0c0a4c6cbc6892fe2ae5bbed21b672b7ec842de04347341925bd34712a37c84da4589578c6fbf1ab4ce8137b5530244f545d7c5bc1fbbd7ffa54eb83a6952d4
HEAD_REF master
PATCHES
add-robin-hood.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
lua BUILD_LUA_BINDINGS
INVERTED_FEATURES
freetype NO_FONT_INTERFACE_DEFAULT
)
# Remove built-in header, instead we use vcpkg version (from robin-hood-hashing port)
file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
${FEATURE_OPTIONS}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(
CONFIG_PATH lib/RmlUi/cmake
)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/lib/RmlUi
${CURRENT_PACKAGES_DIR}/lib/RmlUi
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h
"#if !defined RMLUI_STATIC_LIB"
"#if 0"
)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h
"#if !defined RMLUI_STATIC_LIB"
"#if 0"
)
if ("lua" IN_LIST FEATURES)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h
"#if !defined RMLUI_STATIC_LIB"
"#if 0"
)
endif()
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

34
externals/vcpkg/ports/rmlui/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,34 @@
{
"name": "rmlui",
"version": "4.4",
"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.",
"homepage": "https://github.com/mikke89/RmlUi",
"documentation": "https://mikke89.github.io/RmlUiDoc/",
"license": "MIT",
"dependencies": [
"robin-hood-hashing",
"vcpkg-cmake",
"vcpkg-cmake-config"
],
"default-features": [
"freetype"
],
"features": {
"freetype": {
"description": "Include font engine based on FreeType",
"dependencies": [
{
"name": "freetype",
"default-features": false
}
]
},
"lua": {
"description": "Build Lua bindings",
"dependencies": [
"lua"
]
}
}
}