From 5a82a66853e91f8ea72d66af4bdd69cc4360fcf7 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Fri, 3 Jul 2026 17:04:46 +0200 Subject: [PATCH] Fix conflicts. --- examples/all/all_vendor.odin | 4 +++- vendor/raylib/{v5.5 => v55}/LICENSE | 0 vendor/raylib/{v5.5 => v55}/README.md | 0 vendor/raylib/{v5.5 => v55}/easings.odin | 0 vendor/raylib/{v5.5 => v55}/linux/libraygui.so | Bin vendor/raylib/{v5.5 => v55}/linux/libraylib.so | Bin .../raylib/{v5.5 => v55}/linux/libraylib.so.5.5.0 | Bin vendor/raylib/{v5.5 => v55}/linux/libraylib.so.550 | Bin .../{v5.5 => v55}/macos-arm64/libraygui.dylib | Bin vendor/raylib/{v5.5 => v55}/macos/libraygui.dylib | Bin .../{v5.5 => v55}/macos/libraylib.5.5.0.dylib | Bin .../raylib/{v5.5 => v55}/macos/libraylib.550.dylib | Bin vendor/raylib/{v5.5 => v55}/macos/libraylib.dylib | Bin vendor/raylib/{v5.5 => v55}/raygui.odin | 0 vendor/raylib/{v5.5 => v55}/raylib.odin | 0 vendor/raylib/{v5.5 => v55}/raymath.odin | 0 vendor/raylib/{v5.5 => v55}/rlgl/rlgl.odin | 0 vendor/raylib/{v5.5 => v55}/windows/raygui.dll | Bin vendor/raylib/{v5.5 => v55}/windows/raygui.lib | Bin vendor/raylib/{v5.5 => v55}/windows/rayguidll.lib | Bin vendor/raylib/{v5.5 => v55}/windows/raylib.dll | Bin vendor/raylib/{v5.5 => v55}/windows/raylib.lib | Bin vendor/raylib/{v5.5 => v55}/windows/raylibdll.lib | Bin vendor/raylib/v6/easings.odin | 2 +- vendor/raylib/v6/raygui.odin | 2 +- vendor/raylib/v6/raylib.odin | 5 +++-- vendor/raylib/v6/raymath.odin | 2 +- 27 files changed, 9 insertions(+), 6 deletions(-) rename vendor/raylib/{v5.5 => v55}/LICENSE (100%) rename vendor/raylib/{v5.5 => v55}/README.md (100%) rename vendor/raylib/{v5.5 => v55}/easings.odin (100%) rename vendor/raylib/{v5.5 => v55}/linux/libraygui.so (100%) rename vendor/raylib/{v5.5 => v55}/linux/libraylib.so (100%) rename vendor/raylib/{v5.5 => v55}/linux/libraylib.so.5.5.0 (100%) rename vendor/raylib/{v5.5 => v55}/linux/libraylib.so.550 (100%) rename vendor/raylib/{v5.5 => v55}/macos-arm64/libraygui.dylib (100%) rename vendor/raylib/{v5.5 => v55}/macos/libraygui.dylib (100%) rename vendor/raylib/{v5.5 => v55}/macos/libraylib.5.5.0.dylib (100%) rename vendor/raylib/{v5.5 => v55}/macos/libraylib.550.dylib (100%) rename vendor/raylib/{v5.5 => v55}/macos/libraylib.dylib (100%) rename vendor/raylib/{v5.5 => v55}/raygui.odin (100%) rename vendor/raylib/{v5.5 => v55}/raylib.odin (100%) rename vendor/raylib/{v5.5 => v55}/raymath.odin (100%) rename vendor/raylib/{v5.5 => v55}/rlgl/rlgl.odin (100%) rename vendor/raylib/{v5.5 => v55}/windows/raygui.dll (100%) rename vendor/raylib/{v5.5 => v55}/windows/raygui.lib (100%) rename vendor/raylib/{v5.5 => v55}/windows/rayguidll.lib (100%) rename vendor/raylib/{v5.5 => v55}/windows/raylib.dll (100%) rename vendor/raylib/{v5.5 => v55}/windows/raylib.lib (100%) rename vendor/raylib/{v5.5 => v55}/windows/raylibdll.lib (100%) diff --git a/examples/all/all_vendor.odin b/examples/all/all_vendor.odin index 1605ea8a7..ea9e7d65a 100644 --- a/examples/all/all_vendor.odin +++ b/examples/all/all_vendor.odin @@ -11,7 +11,9 @@ package all @(require) import "vendor:microui" @(require) import "vendor:miniaudio" @(require) import "vendor:portmidi" -@(require) import "vendor:raylib" +// NOTE(jeroen): only one raylib version can be checked at a time +// @(require) import "vendor:raylib/v55" +@(require) import "vendor:raylib/v6" @(require) import "vendor:zlib" @(require) import "vendor:sdl2" diff --git a/vendor/raylib/v5.5/LICENSE b/vendor/raylib/v55/LICENSE similarity index 100% rename from vendor/raylib/v5.5/LICENSE rename to vendor/raylib/v55/LICENSE diff --git a/vendor/raylib/v5.5/README.md b/vendor/raylib/v55/README.md similarity index 100% rename from vendor/raylib/v5.5/README.md rename to vendor/raylib/v55/README.md diff --git a/vendor/raylib/v5.5/easings.odin b/vendor/raylib/v55/easings.odin similarity index 100% rename from vendor/raylib/v5.5/easings.odin rename to vendor/raylib/v55/easings.odin diff --git a/vendor/raylib/v5.5/linux/libraygui.so b/vendor/raylib/v55/linux/libraygui.so similarity index 100% rename from vendor/raylib/v5.5/linux/libraygui.so rename to vendor/raylib/v55/linux/libraygui.so diff --git a/vendor/raylib/v5.5/linux/libraylib.so b/vendor/raylib/v55/linux/libraylib.so similarity index 100% rename from vendor/raylib/v5.5/linux/libraylib.so rename to vendor/raylib/v55/linux/libraylib.so diff --git a/vendor/raylib/v5.5/linux/libraylib.so.5.5.0 b/vendor/raylib/v55/linux/libraylib.so.5.5.0 similarity index 100% rename from vendor/raylib/v5.5/linux/libraylib.so.5.5.0 rename to vendor/raylib/v55/linux/libraylib.so.5.5.0 diff --git a/vendor/raylib/v5.5/linux/libraylib.so.550 b/vendor/raylib/v55/linux/libraylib.so.550 similarity index 100% rename from vendor/raylib/v5.5/linux/libraylib.so.550 rename to vendor/raylib/v55/linux/libraylib.so.550 diff --git a/vendor/raylib/v5.5/macos-arm64/libraygui.dylib b/vendor/raylib/v55/macos-arm64/libraygui.dylib similarity index 100% rename from vendor/raylib/v5.5/macos-arm64/libraygui.dylib rename to vendor/raylib/v55/macos-arm64/libraygui.dylib diff --git a/vendor/raylib/v5.5/macos/libraygui.dylib b/vendor/raylib/v55/macos/libraygui.dylib similarity index 100% rename from vendor/raylib/v5.5/macos/libraygui.dylib rename to vendor/raylib/v55/macos/libraygui.dylib diff --git a/vendor/raylib/v5.5/macos/libraylib.5.5.0.dylib b/vendor/raylib/v55/macos/libraylib.5.5.0.dylib similarity index 100% rename from vendor/raylib/v5.5/macos/libraylib.5.5.0.dylib rename to vendor/raylib/v55/macos/libraylib.5.5.0.dylib diff --git a/vendor/raylib/v5.5/macos/libraylib.550.dylib b/vendor/raylib/v55/macos/libraylib.550.dylib similarity index 100% rename from vendor/raylib/v5.5/macos/libraylib.550.dylib rename to vendor/raylib/v55/macos/libraylib.550.dylib diff --git a/vendor/raylib/v5.5/macos/libraylib.dylib b/vendor/raylib/v55/macos/libraylib.dylib similarity index 100% rename from vendor/raylib/v5.5/macos/libraylib.dylib rename to vendor/raylib/v55/macos/libraylib.dylib diff --git a/vendor/raylib/v5.5/raygui.odin b/vendor/raylib/v55/raygui.odin similarity index 100% rename from vendor/raylib/v5.5/raygui.odin rename to vendor/raylib/v55/raygui.odin diff --git a/vendor/raylib/v5.5/raylib.odin b/vendor/raylib/v55/raylib.odin similarity index 100% rename from vendor/raylib/v5.5/raylib.odin rename to vendor/raylib/v55/raylib.odin diff --git a/vendor/raylib/v5.5/raymath.odin b/vendor/raylib/v55/raymath.odin similarity index 100% rename from vendor/raylib/v5.5/raymath.odin rename to vendor/raylib/v55/raymath.odin diff --git a/vendor/raylib/v5.5/rlgl/rlgl.odin b/vendor/raylib/v55/rlgl/rlgl.odin similarity index 100% rename from vendor/raylib/v5.5/rlgl/rlgl.odin rename to vendor/raylib/v55/rlgl/rlgl.odin diff --git a/vendor/raylib/v5.5/windows/raygui.dll b/vendor/raylib/v55/windows/raygui.dll similarity index 100% rename from vendor/raylib/v5.5/windows/raygui.dll rename to vendor/raylib/v55/windows/raygui.dll diff --git a/vendor/raylib/v5.5/windows/raygui.lib b/vendor/raylib/v55/windows/raygui.lib similarity index 100% rename from vendor/raylib/v5.5/windows/raygui.lib rename to vendor/raylib/v55/windows/raygui.lib diff --git a/vendor/raylib/v5.5/windows/rayguidll.lib b/vendor/raylib/v55/windows/rayguidll.lib similarity index 100% rename from vendor/raylib/v5.5/windows/rayguidll.lib rename to vendor/raylib/v55/windows/rayguidll.lib diff --git a/vendor/raylib/v5.5/windows/raylib.dll b/vendor/raylib/v55/windows/raylib.dll similarity index 100% rename from vendor/raylib/v5.5/windows/raylib.dll rename to vendor/raylib/v55/windows/raylib.dll diff --git a/vendor/raylib/v5.5/windows/raylib.lib b/vendor/raylib/v55/windows/raylib.lib similarity index 100% rename from vendor/raylib/v5.5/windows/raylib.lib rename to vendor/raylib/v55/windows/raylib.lib diff --git a/vendor/raylib/v5.5/windows/raylibdll.lib b/vendor/raylib/v55/windows/raylibdll.lib similarity index 100% rename from vendor/raylib/v5.5/windows/raylibdll.lib rename to vendor/raylib/v55/windows/raylibdll.lib diff --git a/vendor/raylib/v6/easings.odin b/vendor/raylib/v6/easings.odin index ad9a47aaa..d779761a5 100644 --- a/vendor/raylib/v6/easings.odin +++ b/vendor/raylib/v6/easings.odin @@ -1,4 +1,4 @@ -package raylib +package raylib6 import "core:math" diff --git a/vendor/raylib/v6/raygui.odin b/vendor/raylib/v6/raygui.odin index b02fa4438..71a11357e 100644 --- a/vendor/raylib/v6/raygui.odin +++ b/vendor/raylib/v6/raygui.odin @@ -1,4 +1,4 @@ -package raylib +package raylib6 import "core:c" diff --git a/vendor/raylib/v6/raylib.odin b/vendor/raylib/v6/raylib.odin index eafd77db5..9e3d7399f 100644 --- a/vendor/raylib/v6/raylib.odin +++ b/vendor/raylib/v6/raylib.odin @@ -84,7 +84,7 @@ Bindings for [[ raylib v6.0 ; https://www.raylib.com ]]. * ********************************************************************************************** */ -package raylib +package raylib6 import "core:c" import "core:fmt" @@ -979,7 +979,8 @@ foreign lib { // Cursor-related functions - ShowCursor :: proc() --- // Shows cursor + // NOTE(Jeroen): Conflicts with `ShowCursor` in `core:sys/windows` + // ShowCursor :: proc() --- // Shows cursor HideCursor :: proc() --- // Hides cursor IsCursorHidden :: proc() -> bool --- // Check if cursor is not visible EnableCursor :: proc() --- // Enables cursor (unlock cursor) diff --git a/vendor/raylib/v6/raymath.odin b/vendor/raylib/v6/raymath.odin index 324372554..5b0f596d3 100644 --- a/vendor/raylib/v6/raymath.odin +++ b/vendor/raylib/v6/raymath.odin @@ -1,4 +1,4 @@ -package raylib +package raylib6 import "core:math" import "core:math/linalg"