mirror of
https://github.com/odin-lang/Odin.git
synced 2026-07-10 18:09:32 +00:00
Fix conflicts.
This commit is contained in:
@@ -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"
|
||||
|
||||
2
vendor/raylib/v6/easings.odin
vendored
2
vendor/raylib/v6/easings.odin
vendored
@@ -1,4 +1,4 @@
|
||||
package raylib
|
||||
package raylib6
|
||||
|
||||
import "core:math"
|
||||
|
||||
|
||||
2
vendor/raylib/v6/raygui.odin
vendored
2
vendor/raylib/v6/raygui.odin
vendored
@@ -1,4 +1,4 @@
|
||||
package raylib
|
||||
package raylib6
|
||||
|
||||
import "core:c"
|
||||
|
||||
|
||||
5
vendor/raylib/v6/raylib.odin
vendored
5
vendor/raylib/v6/raylib.odin
vendored
@@ -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)
|
||||
|
||||
2
vendor/raylib/v6/raymath.odin
vendored
2
vendor/raylib/v6/raymath.odin
vendored
@@ -1,4 +1,4 @@
|
||||
package raylib
|
||||
package raylib6
|
||||
|
||||
import "core:math"
|
||||
import "core:math/linalg"
|
||||
|
||||
Reference in New Issue
Block a user