Fix conflicts.

This commit is contained in:
Jeroen van Rijn
2026-07-03 17:04:46 +02:00
parent 2b4e2e481e
commit 5a82a66853
27 changed files with 9 additions and 6 deletions

View File

@@ -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"

View File

@@ -1,4 +1,4 @@
package raylib
package raylib6
import "core:math"

View File

@@ -1,4 +1,4 @@
package raylib
package raylib6
import "core:c"

View File

@@ -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)

View File

@@ -1,4 +1,4 @@
package raylib
package raylib6
import "core:math"
import "core:math/linalg"