Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[raylib] Update to 2.6.0 #10068

Merged
merged 2 commits into from
Mar 13, 2020
Merged

[raylib] Update to 2.6.0 #10068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73f9756
[raylib] Update to 2.6.0
Feb 14, 2020
4fa5114
Remove unused comment
Mar 11, 2020
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
3 changes: 1 addition & 2 deletions ports/raylib/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Source: raylib
Version: 2.5.0
Version: 2.6.0
Description: A simple and easy-to-use library to enjoy videogames programming
Supports: !(arm|uwp)
#Build-Depends: glfw3

Feature: non-audio
Description: Build raylib without audio module
26 changes: 9 additions & 17 deletions ports/raylib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# https://github.com/raysan5/raylib/issues/388
if(TARGET_TRIPLET MATCHES "^arm" OR TARGET_TRIPLET MATCHES "uwp$")
message(FATAL_ERROR "raylib doesn't support ARM or UWP.")
endif()
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
message(
"raylib currently requires the following libraries from the system package manager:
libgl1-mesa-dev
Expand All @@ -15,24 +13,21 @@ These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev li
)
endif()

include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO raysan5/raylib
REF a9f33c9a8962735fed5dd1857709d159bc4056fc # 2.5.0
SHA512 36ee474d5f1791385a6841e20632e078c0d3a591076faed0a648533513a3218e2817b0bbf7a921cc003c9aaf6a07024fd48830697d9d85eba307be27bd884ad8
REF 6f3c99a295533e41de3049db5e683d15fd5c6e1a # 2.6.0
SHA512 358ebcffb7e11f319f82ecf791480eb23c40a53b764cad1d2109064bb06575c7af0325bf06ec86bbb2c43b70b12f52b5b6d1318d8857e07ff8e965a1dadbd8e2
HEAD_REF master
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)

if("non-audio" IN_LIST FEATURES)
set(USE_AUDIO OFF)
else()
set(USE_AUDIO ON)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
INVERTED_FEATURES
non-audio USE_AUDIO
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
Expand Down Expand Up @@ -83,7 +78,4 @@ endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)

# Handle copyright
configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)

# CMake integration test
#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)