diff --git a/ports/mygui/Install-tools.patch b/ports/mygui/Install-tools.patch new file mode 100644 index 00000000000000..bdfc2c90f7ab70 --- /dev/null +++ b/ports/mygui/Install-tools.patch @@ -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}) + diff --git a/ports/mygui/Use-vcpkg-sdl2.patch b/ports/mygui/Use-vcpkg-sdl2.patch new file mode 100644 index 00000000000000..6a6059ee6004ef --- /dev/null +++ b/ports/mygui/Use-vcpkg-sdl2.patch @@ -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) diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake index c728aefecc7d3c..a443744f3ce3ce 100644 --- a/ports/mygui/portfile.cmake +++ b/ports/mygui/portfile.cmake @@ -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) @@ -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() @@ -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) diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json index aabd5655a9107e..761ef55f383801 100644 --- a/ports/mygui/vcpkg.json +++ b/ports/mygui/vcpkg.json @@ -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", @@ -23,6 +24,9 @@ "dependencies": [ "opengl" ] + }, + "tools": { + "description": "Install MyGUI tools." } } } diff --git a/versions/baseline.json b/versions/baseline.json index c315072c5e6ed3..2864bbe157eb53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4762,7 +4762,7 @@ }, "mygui": { "baseline": "3.4.1", - "port-version": 2 + "port-version": 3 }, "nameof": { "baseline": "0.10.1", diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index d7b1309f58ae81..2ca6e8ec66502d 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a7598c7df27293baca5e55e28c20aec14bf5672", + "version": "3.4.1", + "port-version": 3 + }, { "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162", "version": "3.4.1",