[sdl1] Change the extension of the template MSBuild solution. (#31685)

* [sdl1] Change the extension of the template MSBuild solution.
It will prevent Visual Studio from suggesting to open it, if you have opened a project using vcpkg as a directory.

* Update version database.
This commit is contained in:
Theodore Tsirpanis 2023-05-30 21:52:52 +03:00 committed by GitHub
parent b4ba8298f5
commit 8c8f5cccef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 13 deletions

View File

@ -13,14 +13,14 @@ vcpkg_from_github(
configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/")
configure_file("${CURRENT_PORT_DIR}/SDL1_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL1_2017.sln" COPYONLY)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(LIB_TYPE StaticLibrary)
else()
set(LIB_TYPE DynamicLibrary)
endif()
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
set(CRT_TYPE_DBG MultiThreadedDebugDLL)
set(CRT_TYPE_REL MultiThreadedDLL)
@ -28,13 +28,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(CRT_TYPE_DBG MultiThreadedDebug)
set(CRT_TYPE_REL MultiThreaded)
endif()
configure_file("${CURRENT_PORT_DIR}/SDL.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj" @ONLY)
configure_file("${CURRENT_PORT_DIR}/SDLmain.vcxproj.in" "${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj" @ONLY)
# This text file gets copied as a library, and included as one in the package
# This text file gets copied as a library, and included as one in the package
file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB")
vcpkg_install_msbuild(
SOURCE_PATH "${SOURCE_PATH}"
PROJECT_SUBPATH VisualC/SDL1_2017.sln
@ -42,13 +42,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib")
if(NOT DEFINED VCPKG_BUILD_TYPE)
@ -74,10 +74,10 @@ else()
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_make()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/man3"

View File

@ -1,7 +1,7 @@
{
"name": "sdl1",
"version": "1.2.15",
"port-version": 17,
"port-version": 18,
"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",

View File

@ -7310,7 +7310,7 @@
},
"sdl1": {
"baseline": "1.2.15",
"port-version": 17
"port-version": 18
},
"sdl1-mixer": {
"baseline": "2023-03-25",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5463be881042b7d98bf14377bb790a2a83c3a39e",
"version": "1.2.15",
"port-version": 18
},
{
"git-tree": "45b686784ad1b01e7cfa7988bc3f95bf9aff6b6a",
"version": "1.2.15",