From 5bb2aee08ba2668a6503de773d4d9b6e1d61d818 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:06:01 +0000 Subject: [PATCH] [raylib] Fix link warning (#41437) --- ports/raylib/fix-link-path.patch | 13 +++++++++++++ ports/raylib/portfile.cmake | 1 + ports/raylib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/raylib.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/raylib/fix-link-path.patch diff --git a/ports/raylib/fix-link-path.patch b/ports/raylib/fix-link-path.patch new file mode 100644 index 000000000..cae084166 --- /dev/null +++ b/ports/raylib/fix-link-path.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake +index 700965c..4815cd6 100644 +--- a/cmake/raylib-config.cmake ++++ b/cmake/raylib-config.cmake +@@ -65,7 +65,7 @@ if (NOT TARGET raylib) + IMPORTED_LOCATION "${raylib_LIBRARIES}" + IMPORTED_IMPLIB "${raylib_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}" +- INTERFACE_LINK_LIBRARIES "${raylib_LDFLAGS}" ++ INTERFACE_LINK_LIBRARIES "${raylib_LIBRARIES}" + INTERFACE_COMPILE_OPTIONS "${raylib_DEFINITIONS}" + ) + diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index e2569322b..0e3e6e56e 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( HEAD_REF master PATCHES android.diff + fix-link-path.patch ) file(GLOB vendored_headers RELATIVE "${SOURCE_PATH}/src/external" "${SOURCE_PATH}/src/external/cgltf.h" diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 7609503df..68e826ce1 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "raylib", "version": "5.0", - "port-version": 1, + "port-version": 2, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index bdd369b1e..61b97618b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7774,7 +7774,7 @@ }, "raylib": { "baseline": "5.0", - "port-version": 1 + "port-version": 2 }, "rbdl": { "baseline": "3.3.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 6bed17139..79e6f9931 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16299f8e3d6b40674ce53b106b764bd7459ad63", + "version": "5.0", + "port-version": 2 + }, { "git-tree": "6ef397a5c5afb217736842e45d9610d084a1fb2d", "version": "5.0",