Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions ports/raylib/fix-linkGlfw.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake
index 1b94cdf..4cc8f8f 100644
--- a/cmake/GlfwImport.cmake
+++ b/cmake/GlfwImport.cmake
@@ -5,7 +5,7 @@ elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE")
find_package(glfw3 3.3.3 QUIET)
endif()
if (glfw3_FOUND)
- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
+ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3)
endif()

# Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option
@@ -32,3 +32,4 @@ else()
MESSAGE(STATUS "Using external GLFW")
set(GLFW_PKG_DEPS glfw3)
endif()
+set(GLFW_PKG_DEPS glfw3)
diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake
index c156d6b..55c5bca 100644
--- a/cmake/LibraryConfigurations.cmake
+++ b/cmake/LibraryConfigurations.cmake
@@ -104,5 +104,5 @@ endif ()
set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY})

if (${PLATFORM} MATCHES "Desktop")
- set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
+ set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw3)
endif ()
8 changes: 6 additions & 2 deletions ports/raylib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li
)
endif()

if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
set(patches fix-linkGlfw.patch)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO raysan5/raylib
REF 4.0.0
SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417
HEAD_REF master
PATCHES ${patches}
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
Expand All @@ -34,8 +39,7 @@ else()
endif()

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_EXAMPLES=OFF
-DBUILD_GAMES=OFF
Expand Down
6 changes: 5 additions & 1 deletion ports/raylib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
"name": "raylib",
"version-semver": "4.0.0",
"port-version": 2,
"port-version": 3,
"description": "A simple and easy-to-use library to enjoy videogames programming",
"homepage": "https://github.com/raysan5/raylib",
"license": "Zlib",
"supports": "!(arm | uwp)",
"dependencies": [
{
"name": "glfw3",
"platform": "!windows"
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6022,7 +6022,7 @@
},
"raylib": {
"baseline": "4.0.0",
"port-version": 2
"port-version": 3
},
"rbdl": {
"baseline": "2.6.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/raylib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743",
"version-semver": "4.0.0",
"port-version": 3
},
{
"git-tree": "94a36f9f2d45dcba0e7ee689b5d58ad11bc4a4b9",
"version-semver": "4.0.0",
Expand Down