aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-08-08 07:17:24 +0800
committerGitHub <noreply@github.com>2020-08-07 16:17:24 -0700
commit8121b4ec3d6a11353daf7639ed9082a78e617a2e (patch)
tree1095849904b7d283fe4819afca6bf8929be045d8
parent23fcc57ad188ea9ba94f286bf24d408ccf81fd2f (diff)
downloadvcpkg-8121b4ec3d6a11353daf7639ed9082a78e617a2e.tar.gz
vcpkg-8121b4ec3d6a11353daf7639ed9082a78e617a2e.zip
[raylib] Fix the feature issue (#12783)
-rw-r--r--ports/raylib/CONTROL7
-rw-r--r--ports/raylib/portfile.cmake10
2 files changed, 7 insertions, 10 deletions
diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL
index 382de52f3..efa8155c2 100644
--- a/ports/raylib/CONTROL
+++ b/ports/raylib/CONTROL
@@ -1,9 +1,10 @@
Source: raylib
Version: 3.0.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
Supports: !(arm|uwp)
+Default-Features: use-audio
-Feature: non-audio
-Description: Build raylib without audio module
+Feature: use-audio
+Description: Build raylib with audio module
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake
index f39d61d1c..0d47a969f 100644
--- a/ports/raylib/portfile.cmake
+++ b/ports/raylib/portfile.cmake
@@ -25,8 +25,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
- INVERTED_FEATURES
- non-audio USE_AUDIO
+ use-audio USE_AUDIO
)
vcpkg_configure_cmake(
@@ -37,8 +36,8 @@ vcpkg_configure_cmake(
-DBUILD_GAMES=OFF
-DSHARED=${SHARED}
-DSTATIC=${STATIC}
- -DUSE_AUDIO=${USE_AUDIO}
-DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows
+ ${FEATURE_OPTIONS}
OPTIONS_DEBUG
-DENABLE_ASAN=ON
-DENABLE_UBSAN=ON
@@ -74,8 +73,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
)
endif()
-# Install usage
configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
-
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)