Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/mygui/Install-tools.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index 6483339..71710de 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -170,6 +170,9 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
set(MYGUI_EXEC_TYPE WIN32)
endif ()
add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
+ install(TARGETS ${PROJECTNAME}
+ RUNTIME DESTINATION bin
+ )
endif ()
set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})

14 changes: 14 additions & 0 deletions ports/mygui/Use-vcpkg-sdl2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 2b160ff..559e6a8 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -99,6 +99,8 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})

mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
-target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
+
+find_package(SDL2 CONFIG REQUIRED)
+target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::SDL2 SDL2::SDL2main)

add_dependencies(${PROJECTNAME} MyGUIEngine)
13 changes: 12 additions & 1 deletion ports/mygui/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-generation.patch
Use-vcpkg-sdl2.patch
Install-tools.patch
)

if("opengl" IN_LIST FEATURES)
Expand All @@ -18,18 +20,23 @@ else()
set(MYGUI_RENDERSYSTEM 1)
endif()

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools MYGUI_BUILD_TOOLS
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DMYGUI_STATIC=TRUE
-DMYGUI_BUILD_DEMOS=FALSE
-DMYGUI_BUILD_PLUGINS=TRUE
-DMYGUI_BUILD_TOOLS=FALSE
-DMYGUI_BUILD_UNITTESTS=FALSE
-DMYGUI_BUILD_TEST_APP=FALSE
-DMYGUI_BUILD_WRAPPER=FALSE
-DMYGUI_BUILD_DOCS=FALSE
-DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM}
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
Expand All @@ -41,5 +48,9 @@ file(REMOVE_RECURSE

vcpkg_fixup_pkgconfig()

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)
6 changes: 5 additions & 1 deletion ports/mygui/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "mygui",
"version": "3.4.1",
"port-version": 2,
"port-version": 3,
"description": "Fast, flexible and simple GUI",
"homepage": "http://mygui.info",
"license": "MIT",
"supports": "!uwp",
"dependencies": [
"freetype",
Expand All @@ -23,6 +24,9 @@
"dependencies": [
"opengl"
]
},
"tools": {
"description": "Install MyGUI tools."
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4762,7 +4762,7 @@
},
"mygui": {
"baseline": "3.4.1",
"port-version": 2
"port-version": 3
},
"nameof": {
"baseline": "0.10.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mygui.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5a7598c7df27293baca5e55e28c20aec14bf5672",
"version": "3.4.1",
"port-version": 3
},
{
"git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162",
"version": "3.4.1",
Expand Down