aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonid Pospelov <pospelovlm@yandex.ru>2021-06-15 21:53:40 +0300
committerGitHub <noreply@github.com>2021-06-15 11:53:40 -0700
commit6bbafb22a5bb2a5be30659b45ccb0e8a7bffb2f2 (patch)
treecaeddd907ff29757035bb64bb0647a8548d246b6
parentd955e62d7e460689d46fe90ea907a24e8da2f9c9 (diff)
downloadvcpkg-6bbafb22a5bb2a5be30659b45ccb0e8a7bffb2f2.tar.gz
vcpkg-6bbafb22a5bb2a5be30659b45ccb0e8a7bffb2f2.zip
[raylib] Fix MinGW build (#18362)
.
-rw-r--r--ports/raylib/portfile.cmake10
-rw-r--r--ports/raylib/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/r-/raylib.json5
4 files changed, 15 insertions, 3 deletions
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake
index 25b91262b..7af3d4c36 100644
--- a/ports/raylib/portfile.cmake
+++ b/ports/raylib/portfile.cmake
@@ -30,6 +30,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
use-audio USE_AUDIO
)
+if(VCPKG_TARGET_IS_MINGW)
+ set(DEBUG_ENABLE_SANITIZERS OFF)
+else()
+ set(DEBUG_ENABLE_SANITIZERS ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -41,8 +47,8 @@ vcpkg_configure_cmake(
-DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows
${FEATURE_OPTIONS}
OPTIONS_DEBUG
- -DENABLE_ASAN=ON
- -DENABLE_UBSAN=ON
+ -DENABLE_ASAN=${DEBUG_ENABLE_SANITIZERS}
+ -DENABLE_UBSAN=${DEBUG_ENABLE_SANITIZERS}
-DENABLE_MSAN=OFF
OPTIONS_RELEASE
-DENABLE_ASAN=OFF
diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json
index a1f602fa1..f63f9a7ea 100644
--- a/ports/raylib/vcpkg.json
+++ b/ports/raylib/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "raylib",
"version-semver": "3.7.0",
+ "port-version": 1,
"description": "A simple and easy-to-use library to enjoy videogames programming",
"homepage": "https://github.com/raysan5/raylib",
"supports": "!(arm | uwp)",
diff --git a/versions/baseline.json b/versions/baseline.json
index 274696d12..4ff7df52a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5430,7 +5430,7 @@
},
"raylib": {
"baseline": "3.7.0",
- "port-version": 0
+ "port-version": 1
},
"rbdl": {
"baseline": "2.6.0",
diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json
index b564c131c..493c25123 100644
--- a/versions/r-/raylib.json
+++ b/versions/r-/raylib.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "e27352fbab2a4e815a478265032a4faa60d34060",
+ "version-semver": "3.7.0",
+ "port-version": 1
+ },
+ {
"git-tree": "197576ef49480a84f0d5a4d153a1d9416b8230fc",
"version-semver": "3.7.0",
"port-version": 0