From e22937a2f91640e8b1739cbf2f05361afce282a5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 16 Aug 2023 01:53:15 +0200 Subject: [PATCH] [sdl1] msbuild (#33152) * sdl1 msbuild * v db --- ports/sdl1/portfile.cmake | 11 ++--------- ports/sdl1/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/s-/sdl1.json | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index c4fe695cae..772b22899c 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -38,16 +38,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH VisualC/SDL1_2017.sln - INCLUDES_SUBPATH include - LICENSE_SUBPATH COPYING - ALLOW_ROOT_INCLUDES ) #Take all the fils into include/SDL to sovle conflict with SDL2 port - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/doxyfile") - file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") - file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/SDL") + file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/SDL") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib") @@ -82,6 +76,5 @@ else() "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" ) - - file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index 113aea6732..304fabaddd 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,9 +1,16 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 18, + "port-version": 19, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org", "license": "LGPL-2.1-or-later", - "supports": "!osx & !uwp" + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 27eb3f65e1..5e68735522 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7442,7 +7442,7 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 18 + "port-version": 19 }, "sdl1-mixer": { "baseline": "2023-03-25", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index 3426feee68..8d959596ff 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "201b5219b28e0c1299f7ebda041cbc85115983ba", + "version": "1.2.15", + "port-version": 19 + }, { "git-tree": "5463be881042b7d98bf14377bb790a2a83c3a39e", "version": "1.2.15",