From 6bbafb22a5bb2a5be30659b45ccb0e8a7bffb2f2 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 15 Jun 2021 21:53:40 +0300 Subject: [PATCH] [raylib] Fix MinGW build (#18362) . --- ports/raylib/portfile.cmake | 10 ++++++++-- ports/raylib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/raylib.json | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 25b91262b7d9aa..7af3d4c36090de 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 a1f602fa1f05a4..f63f9a7ea9cdf3 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 274696d12b3f89..4ff7df52a65dd7 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 b564c131c33f70..493c25123d1f61 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e27352fbab2a4e815a478265032a4faa60d34060", + "version-semver": "3.7.0", + "port-version": 1 + }, { "git-tree": "197576ef49480a84f0d5a4d153a1d9416b8230fc", "version-semver": "3.7.0",