diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 47f1b0730e..d870cffe92 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -16,7 +16,7 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LIB_TYPE StaticLibrary) + set(LIB_TYPE StaticLibrary) else() set(LIB_TYPE DynamicLibrary) endif() @@ -80,4 +80,11 @@ else() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/sdl1/bin/sdl-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/sdl1/bin/sdl-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/sdl1/debug/bin/sdl-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/sdl1/debug/bin/sdl-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() endif() \ No newline at end of file diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index e75f7a2179..299c16461f 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1", - "version-string": "1.2.15", - "port-version": 14, + "version": "1.2.15", + "port-version": 15, "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" } diff --git a/versions/baseline.json b/versions/baseline.json index 1d8218e17f..f661eb4958 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6250,7 +6250,7 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 14 + "port-version": 15 }, "sdl1-net": { "baseline": "1.2.8", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index 16a3f5827f..eaa05de79d 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a3aba1bba75ee6d613144dbd6b2c64cbe6a090c", + "version": "1.2.15", + "port-version": 15 + }, { "git-tree": "dd8e1026af78ffd7bb4e9d6fa1455579367206e1", "version-string": "1.2.15",