Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[MYGUI] Update to 3.5.0 (#52862)

This commit is contained in:
Sarah Sunday 2026-07-30 16:30:22 -05:00 committed by GitHub
parent 3411c0cdb4
commit 8586ecbf12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 35 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/mygui/Install-tools.patch
View File

@ -1,16 +0,0 @@
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index 6483339..0b35148 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -170,6 +170,11 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
set(MYGUI_EXEC_TYPE WIN32)
endif ()
add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
+ if (APPLE)
+ install(TARGETS ${PROJECTNAME} BUNDLE DESTINATION bin)
+ else ()
+ install(TARGETS ${PROJECTNAME} RUNTIME DESTINATION bin)
+ endif ()
endif ()
set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})

30
ports/mygui/fix-generation.patch
View File

@ -1,30 +0,0 @@
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index a0ef573..b77566e 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -5,7 +5,7 @@
#############################################################
if(WIN32)
- set(MYGUI_CMAKE_DIR "CMake")
+ set(MYGUI_CMAKE_DIR "share")
else(WIN32)
set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake")
endif(WIN32)
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index 8fb1ce4..6483339 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -7,10 +7,10 @@ if (WIN32)
set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
set(MYGUI_MINSIZE_PATH "/MinSizeRel")
set(MYGUI_DEBUG_PATH "/Debug")
- set(MYGUI_LIB_RELEASE_PATH "/Release")
+ set(MYGUI_LIB_RELEASE_PATH "")
set(MYGUI_LIB_RELWDBG_PATH "/RelWithDebInfo")
set(MYGUI_LIB_MINSIZE_PATH "/MinSizeRel")
- set(MYGUI_LIB_DEBUG_PATH "/Debug")
+ set(MYGUI_LIB_DEBUG_PATH "")
set(MYGUI_PLUGIN_PATH "/opt")
elseif (UNIX)
set(MYGUI_RELEASE_PATH "")

13
ports/mygui/fix-tools-lnk2005.patch
View File

@ -1,13 +0,0 @@
diff --git a/Tools/EditorFramework/ComponentFactory.cpp b/Tools/EditorFramework/ComponentFactory.cpp
index 3311936..701af6d 100644
--- a/Tools/EditorFramework/ComponentFactory.cpp
+++ b/Tools/EditorFramework/ComponentFactory.cpp
@@ -46,7 +46,7 @@ namespace tools
FACTORY_ITEM(FocusInfoControl)
FACTORY_ITEM(DataListBaseControl)
FACTORY_ITEM(ColourPanel)
- FACTORY_ITEM(BackgroundControl)
+// FACTORY_ITEM(BackgroundControl)
FACTORY_ITEM(TextureBrowseControl)
FACTORY_ITEM(TextFieldControl)
FACTORY_ITEM(SettingsWindow)

26
ports/mygui/opengl.patch
View File

@ -1,26 +0,0 @@
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index db7d6610c..eb9190e07 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -41,12 +41,9 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 3)
elseif(MYGUI_RENDERSYSTEM EQUAL 4)
add_definitions("-DMYGUI_OPENGL_PLATFORM")
include_directories(SYSTEM
- ${OPENGL_INCLUDE_DIR}
${SDL2_IMAGE_INCLUDE_DIRS}
${MYGUI_SOURCE_DIR}/Platforms/${MYGUI_PLATFORM_NAME}/${MYGUI_PLATFORM_NAME}Platform/include
)
- include_directories(SYSTEM include/GL)
- link_directories(${OPENGL_LIB_DIR})
link_directories(${SDL2_IMAGE_LIB_DIR})
elseif(MYGUI_RENDERSYSTEM EQUAL 5)
add_definitions("-DMYGUI_DIRECTX_PLATFORM")
@@ -106,3 +103,8 @@ if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
endif()
add_dependencies(${PROJECTNAME} MyGUIEngine)
+
+if(MYGUI_RENDERSYSTEM EQUAL 4)
+ find_package(OpenGL REQUIRED)
+ target_link_libraries(${PROJECTNAME} OpenGL::GL)
+endif()

119
ports/mygui/platform-lib-static.patch
View File

@ -1,119 +0,0 @@
diff --git a/Platforms/DirectX/DirectXPlatform/CMakeLists.txt b/Platforms/DirectX/DirectXPlatform/CMakeLists.txt
index 169a2afe4..2ea45af2b 100644
--- a/Platforms/DirectX/DirectXPlatform/CMakeLists.txt
+++ b/Platforms/DirectX/DirectXPlatform/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
include(${PROJECTNAME}.list)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/Platforms/DirectX11/DirectX11Platform/CMakeLists.txt b/Platforms/DirectX11/DirectX11Platform/CMakeLists.txt
index 251fcdbe3..16d4f33a5 100644
--- a/Platforms/DirectX11/DirectX11Platform/CMakeLists.txt
+++ b/Platforms/DirectX11/DirectX11Platform/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
include(${PROJECTNAME}.list)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/Platforms/Dummy/DummyPlatform/CMakeLists.txt b/Platforms/Dummy/DummyPlatform/CMakeLists.txt
index 1055694f2..625391132 100644
--- a/Platforms/Dummy/DummyPlatform/CMakeLists.txt
+++ b/Platforms/Dummy/DummyPlatform/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(
include(${PROJECTNAME}.list)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/Platforms/Ogre/OgrePlatform/CMakeLists.txt b/Platforms/Ogre/OgrePlatform/CMakeLists.txt
index a151abcf8..23f8a2373 100644
--- a/Platforms/Ogre/OgrePlatform/CMakeLists.txt
+++ b/Platforms/Ogre/OgrePlatform/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(
include(${PROJECTNAME}.list)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
index 0d58d3d71..78eaf0267 100644
--- a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
+++ b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
@@ -19,7 +19,7 @@ if (NOT MYGUI_USE_SYSTEM_GLEW)
endif ()
add_definitions(-DGL_GLEXT_PROTOTYPES)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt b/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt
index 27d96da3e..4dcee1601 100644
--- a/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt
+++ b/Platforms/OpenGL3/OpenGL3Platform/CMakeLists.txt
@@ -19,7 +19,7 @@ if (NOT MYGUI_USE_SYSTEM_GLEW)
endif ()
add_definitions(-DGL_GLEXT_PROTOTYPES)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
diff --git a/Platforms/OpenGLES/OpenGLESPlatform/CMakeLists.txt b/Platforms/OpenGLES/OpenGLESPlatform/CMakeLists.txt
index bd6d9657b..ad31fc158 100644
--- a/Platforms/OpenGLES/OpenGLESPlatform/CMakeLists.txt
+++ b/Platforms/OpenGLES/OpenGLESPlatform/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
include(${PROJECTNAME}.list)
add_definitions(-DGL_GLEXT_PROTOTYPES)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
add_dependencies(${PROJECTNAME} MyGUIEngine)
From 32e39f8de4b750ed5d2332ee18846f23b7e98df5 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Tue, 29 Oct 2024 14:53:52 +0000
Subject: [PATCH] Explicitly mark another library as static
I've also figured out why this problem wasn't obvious.
It only happens when someone's used the CMake-standard BUILD_SHARED_LIBS option, which controls the default behaviour for add_library.
When MyGUI is built as a standalone project, this won't be set (unless someone's done it manually) so it's fine.
When MyGUI is built as part of a larger project (e.g. package manager like vcpkg or CPM, or as a nested project with FetchContent), it's likely to have been set by something else.
It might be a good idea to pick the default value of MYGUI_STATIC to match BUILD_SHARED_LIBS if it's set, but I've not done that in this PR.
---
Common/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index e97507019..87a16290f 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -99,7 +99,7 @@ SOURCE_GROUP("Base" FILES
Input/SDL/ResourceSDLPointer.cpp
)
-add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+add_library(${PROJECTNAME} STATIC ${HEADER_FILES} ${SOURCE_FILES})
mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)

52
ports/mygui/portfile.cmake
View File

@ -1,60 +1,42 @@
vcpkg_download_distfile(
basic_string_patch
URLS "https://github.com/MyGUI/mygui/commit/0731785d83431bd17a0854f19bea9a7d687de5a7.diff?full_index=1"
FILENAME "MyGUI-mygui-basic-string-0731785.diff"
SHA512 4ca252b8d37d9b98b9a1295c181325a33c30534757f8adbbcceceafacd97ff6987fb7a5d1f087b960519c923007e6adff2e8b1d873d75e7faff05b9a20b9cd79
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MyGUI/mygui
REF MyGUI${VERSION}
SHA512 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb
REF v${VERSION}
HEAD_REF master
PATCHES
fix-generation.patch
Install-tools.patch
opengl.patch
sdl2-static.patch
fix-tools-lnk2005.patch
platform-lib-static.patch
${basic_string_patch}
SHA512 6bf0430d170a0a6a2afa3724973811025e11bf6622afab8077f4024eea12f4e2835e19b88b46f7a9231ba151445e2a79a8dabee13b6a1e5f6725ac3b880afbeb
)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
message(STATUS "Setting MYGUI_RENDERSYSTEM to 8 (GLES) - officially supported MyGUI render system for wasm32")
set(MYGUI_RENDERSYSTEM 8)
elseif("opengl" IN_LIST FEATURES)
set(MYGUI_RENDERSYSTEM 4)
else()
set(MYGUI_RENDERSYSTEM 1)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
plugins MYGUI_BUILD_PLUGINS
tools MYGUI_BUILD_TOOLS
msdf MYGUI_MSDF_FONTS
msdf MYGUI_USE_SYSTEM_MSDFGEN
INVERTED_FEATURES
obsolete MYGUI_DONT_USE_OBSOLETE
plugins MYGUI_DISABLE_PLUGINS
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MYGUI_STATIC)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DMYGUI_STATIC=${MYGUI_STATIC}
-DMYGUI_BUILD_DEMOS=FALSE
-DMYGUI_BUILD_UNITTESTS=FALSE
-DMYGUI_BUILD_TEST_APP=FALSE
-DMYGUI_BUILD_WRAPPER=FALSE
-DMYGUI_BUILD_DOCS=FALSE
-DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM}
-DMYGUI_BUILD_TOOLS=FALSE
-DMYGUI_USE_SYSTEM_PUGIXML=TRUE
-DMYGUI_RENDERSYSTEM=1 # Use an overlay port to change the render system. Read the discussion at: https://github.com/microsoft/vcpkg/pull/52862
${FEATURE_OPTIONS}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/MyGUI)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/MYGUI/MyGUI_Platform.h"
"#ifndef MYGUI_PLATFORM_H_\n#define MYGUI_PLATFORM_H_"
"#ifndef MYGUI_PLATFORM_H_\n#define MYGUI_PLATFORM_H_\n\n#define MYGUI_STATIC"
)
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
@ -64,9 +46,5 @@ file(REMOVE_RECURSE
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES FontEditor ImageEditor LayoutEditor SkinEditor AUTO_CLEAN)
endif()
# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

35
ports/mygui/sdl2-static.patch
View File

@ -1,35 +0,0 @@
diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
index 4dd33abe4..3911acef3 100644
--- a/CMake/Packages/FindSDL2.cmake
+++ b/CMake/Packages/FindSDL2.cmake
@@ -49,7 +49,7 @@ IF(NOT SDL2_FOUND)
)
find_library(SDL2_LIBRARY
- NAMES SDL2
+ NAMES SDL2 SDL2-static
HINTS
${PC_SDL2_LIBDIR}
${PC_SDL2_LIBRARY_DIRS}
@@ -87,7 +87,7 @@ IF(NOT SDL2_FOUND)
set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
if (WIN32)
- set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version)
+ set(SDL2_LIBRARIES ${SDL2_LIBRARIES} winmm imm32 version setupapi)
endif()
include(FindPackageHandleStandardArgs)
diff --git a/CMake/Packages/FindSDL2_image.cmake b/CMake/Packages/FindSDL2_image.cmake
index 4f0bc5f17..857806b1f 100644
--- a/CMake/Packages/FindSDL2_image.cmake
+++ b/CMake/Packages/FindSDL2_image.cmake
@@ -41,7 +41,7 @@ IF(NOT SDL2_IMAGE_FOUND)
)
find_library(SDL2_IMAGE_LIBRARY
- NAMES SDL2_image
+ NAMES SDL2_image SDL2_image-static
HINTS
${PC_SDL2_IMAGE_LIBDIR}
${PC_SDL2_IMAGE_LIBRARY_DIRS}

29
ports/mygui/vcpkg.json
View File

@ -1,14 +1,13 @@
{
"name": "mygui",
"version": "3.4.3",
"port-version": 4,
"version": "3.5.0",
"description": "Fast, flexible and simple GUI",
"homepage": "http://mygui.info",
"license": "MIT",
"supports": "!uwp",
"dependencies": [
"freetype",
"sdl2-image",
"pugixml",
{
"name": "vcpkg-cmake",
"host": true
@ -19,22 +18,20 @@
}
],
"features": {
"obsolete": {
"description": "Keep obsolete functions."
},
"opengl": {
"description": "Use OpenGL render system.",
"supports": "!android",
"msdf": {
"description": "Enable msdf support",
"dependencies": [
"opengl"
{
"name": "msdfgen",
"default-features": false,
"features": [
"extensions"
]
}
]
},
"plugins": {
"description": "Build MyGUI plugins."
},
"tools": {
"description": "Install MyGUI tools.",
"supports": "!android"
"obsolete": {
"description": "Keep obsolete functions."
}
}
}

2
scripts/ci.feature.baseline.txt
View File

@ -799,8 +799,6 @@ msquic(android)=fail
muda:arm64-linux=cascade
mujoco:arm64-linux=cascade
mvfst:arm64-linux=cascade
mygui:arm64-linux=cascade
mygui[tools]:arm64-osx=feature-fails # Linker errors undefined symbols. See https://github.com/microsoft/vcpkg/issues/34416
mysql-connector-cpp:arm64-linux=fail
nana:arm64-linux=fail
nana:x64-linux=fail

4
versions/baseline.json
View File

@ -6901,8 +6901,8 @@
"port-version": 1
},
"mygui": {
"baseline": "3.4.3",
"port-version": 4
"baseline": "3.5.0",
"port-version": 0
},
"mypaint-brushes": {
"baseline": "2.0.2",

5
versions/m-/mygui.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6e8f2dc4401bf2ce0ba07ea210b28091512c1796",
"version": "3.5.0",
"port-version": 0
},
{
"git-tree": "12aa141343c23a82d77966a0eeff2818214e0b4b",
"version": "3.4.3",