From cc17a7656c04e114ca67771f89b0fb8f493f8a1f Mon Sep 17 00:00:00 2001 From: Michael Scherbakow Date: Sun, 14 May 2023 21:14:16 +0200 Subject: [PATCH 1/3] Update build.zig be be able to build with current zig master (#3064) --- src/build.zig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/build.zig b/src/build.zig index e4c1e0c44..58cf84fec 100644 --- a/src/build.zig +++ b/src/build.zig @@ -8,7 +8,11 @@ pub fn addRaylib(b: *std.build.Builder, target: std.zig.CrossTarget) *std.build. "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891 }; - const raylib = b.addStaticLibrary("raylib", null); + const raylib = b.addStaticLibrary(std.Build.StaticLibraryOptions{ + .name = "raylib", + .target = target, + .optimize = b.standardOptimizeOption(.{ .preferred_optimize_mode = .ReleaseSafe }), + }); raylib.linkLibC(); raylib.addIncludePath(srcdir ++ "/external/glfw/include"); From 818312683ee92efde550f7eaa88fcceb773eaf0b Mon Sep 17 00:00:00 2001 From: lesleyrs <19632758+lesleyrs@users.noreply.github.com> Date: Sun, 14 May 2023 21:15:32 +0200 Subject: [PATCH 2/3] update cmake example project (#3062) * update cmake example project * off is the correct one --- projects/CMake/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index cfd924fba..cc606a4a2 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -5,12 +5,13 @@ project(example) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Dependencies -set(RAYLIB_VERSION 4.2.0) +set(RAYLIB_VERSION 4.5.0) find_package(raylib ${RAYLIB_VERSION} QUIET) # QUIET or REQUIRED if (NOT raylib_FOUND) # If there's none, fetch and build raylib include(FetchContent) FetchContent_Declare( raylib + DOWNLOAD_EXTRACT_TIMESTAMP OFF URL https://github.com/raysan5/raylib/archive/refs/tags/${RAYLIB_VERSION}.tar.gz ) FetchContent_GetProperties(raylib) From 26a3536958e9d4d641edbff0530c41625871b6be Mon Sep 17 00:00:00 2001 From: hamyy Date: Mon, 15 May 2023 05:20:43 +1000 Subject: [PATCH 3/3] GetCurrentMonitor() bugfix (#3058) * GetCurrentMonitor() bugfix * GetCurrentMonitor() bugfix --- src/rcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rcore.c b/src/rcore.c index 476ea8e2f..881739c73 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -1785,7 +1785,7 @@ int GetCurrentMonitor(void) monitor = monitors[i]; glfwGetMonitorWorkarea(monitor, &mx, &my, &width, &height); - if (x >= mx && x <= (mx + width) && y >= my && y <= (my + height)) + if (x >= mx && x < (mx + width) && y >= my && y < (my + height)) { index = i; break;