diff --git a/core/sys/windows/user32.odin b/core/sys/windows/user32.odin index d2f54b127..4668acefd 100644 --- a/core/sys/windows/user32.odin +++ b/core/sys/windows/user32.odin @@ -205,7 +205,7 @@ foreign user32 { GetCursorPos :: proc(lpPoint: LPPOINT) -> BOOL --- SetCursorPos :: proc(X, Y: INT) -> BOOL --- SetCursor :: proc(hCursor: HCURSOR) -> HCURSOR --- - when !intrinsics.is_package_imported("raylib") { + when !intrinsics.is_package_imported("raylib") && !intrisincs.is_package_imported("raylib6") { ShowCursor :: proc(bShow: BOOL) -> INT --- } diff --git a/vendor/raylib/v6/raylib.odin b/vendor/raylib/v6/raylib.odin index 9cbeb266b..6fb1c5217 100644 --- a/vendor/raylib/v6/raylib.odin +++ b/vendor/raylib/v6/raylib.odin @@ -981,8 +981,7 @@ foreign lib { // Cursor-related functions - // NOTE(Jeroen): Conflicts with `ShowCursor` in `core:sys/windows` - // ShowCursor :: proc() --- // Shows cursor + ShowCursor :: proc() --- // Shows cursor HideCursor :: proc() --- // Hides cursor IsCursorHidden :: proc() -> bool --- // Check if cursor is not visible EnableCursor :: proc() --- // Enables cursor (unlock cursor)