ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-01 20:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bill/sdl3

Browse Source
This commit is contained in:
gingerBill
2025-01-30 10:37:21 +00:00
parent 998d6525b7 2656ecd4e1
commit 5efa3510cf
68 changed files with 580 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/commonmark/cmark.odin
Vendored
+1 -2
View File
@@ -7,7 +7,6 @@
package vendor_commonmark
import "core:c"
import "core:c/libc"
import "base:runtime"
COMMONMARK_SHARED :: #config(COMMONMARK_SHARED, false)
@@ -450,7 +449,7 @@ foreign lib {
// Called `parse_from_libc_file` so as not to confuse with Odin's file handling.
@(link_name = "parse_from_file")
parse_from_libc_file :: proc(file: ^libc.FILE, options: Options) -> (root: ^Node) ---
parse_from_libc_file :: proc(file: ^c.FILE, options: Options) -> (root: ^Node) ---
}
parser_feed_from_string :: proc "c" (parser: ^Parser, s: string) {
vendor/miniaudio/engine.odin
Vendored
+4 -4
View File
@@ -150,9 +150,9 @@ sound_inlined :: struct {
@(default_calling_convention="c", link_prefix="ma_")
foreign lib {
@(deprecated="Will be removed in 0.12. Use sound_config_init2() instead.")
@(deprecated="Will be removed in 0.12. Use sound_config_init_2() instead.")
sound_config_init :: proc() -> sound_config ---
sound_config_init2 :: proc(pEngine: ^engine) -> sound_config --- /* Will be renamed to sound_config_init() in version 0.12. */
sound_config_init_2 :: proc(pEngine: ^engine) -> sound_config --- /* Will be renamed to sound_config_init() in version 0.12. */
sound_init_from_file :: proc(pEngine: ^engine, pFilePath: cstring, flags: sound_flags, pGroup: ^sound_group, pDoneFence: ^fence, pSound: ^sound) -> result ---
sound_init_from_file_w :: proc(pEngine: ^engine, pFilePath: [^]c.wchar_t, flags: sound_flags, pGroup: ^sound_group, pDoneFence: ^fence, pSound: ^sound) -> result ---
@@ -241,9 +241,9 @@ sound_group :: distinct sound
@(default_calling_convention="c", link_prefix="ma_")
foreign lib {
@(deprecated="Will be removed in 0.12. Use sound_config_init2() instead.")
@(deprecated="Will be removed in 0.12. Use sound_config_init_2() instead.")
sound_group_config_init :: proc() -> sound_group_config ---
sound_group_config_init2 :: proc(pEngine: ^engine) -> sound_group_config ---
sound_group_config_init_2 :: proc(pEngine: ^engine) -> sound_group_config ---
sound_group_init :: proc(pEngine: ^engine, flags: sound_flags, pParentGroup, pGroup: ^sound_group) -> result ---
sound_group_init_ex :: proc(pEngine: ^engine, pConfig: ^sound_group_config, pGroup: ^sound_group) -> result ---
vendor/raylib/raylib.odin
Vendored
+1 -1
View File
@@ -1205,7 +1205,7 @@ foreign lib {
CameraMoveForward :: proc(camera: ^Camera, distance: f32, moveInWorldPlane: bool) --- // move the camera in its forward direction
CameraMoveUp :: proc(camera: ^Camera, distance: f32) --- // move camera in its up direction
CameraMoveRight :: proc(camera: ^Camera, distance: f32, delta: f32) --- // move camera in it's current right direction
CameraMoveRight :: proc(camera: ^Camera, distance: f32, moveInWorldPlane: bool) --- // move camera in it's current right direction
CameraMoveToTarget :: proc(camera: ^Camera, delta: f32) --- // moves the camera position closer/farther to/from the camera target
CameraYaw :: proc(camera: ^Camera, angle: f32, rotateAroundTarget: bool) --- // rotates the camera around its up vector (left and right)
CameraPitch :: proc(camera: ^Camera, angle: f32, lockView: bool, rotateAroundTarget: bool, rotateUp: bool) --- // rotates the camera around its right vector (up and down)
vendor/sdl2/sdl2.odin
Vendored
+2
View File
@@ -26,8 +26,10 @@ import "core:c"
import "base:intrinsics"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_audio.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_blendmode.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_cpuinfo.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_events.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_gamecontroller.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_gesture_haptic.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_hints.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_joystick.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_keyboard.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_log.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_messagebox.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_metal.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_mouse.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_mutex.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_pixels.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_rect.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_render.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_rwops.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_stdinc.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_surface.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_system.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_syswm.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_thread.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_timer.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_touch.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_video.odin
Vendored
+2
View File
@@ -3,8 +3,10 @@ package sdl2
import "core:c"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/sdl2/sdl_vulkan.odin
Vendored
+2
View File
@@ -4,8 +4,10 @@ import "core:c"
import vk "vendor:vulkan"
when ODIN_OS == .Windows {
@(ignore_duplicates)
foreign import lib "SDL2.lib"
} else {
@(ignore_duplicates)
foreign import lib "system:SDL2"
}
vendor/stb/image/stb_image.odin
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package stb_image
import c "core:c/libc"
import "core:c"
@(private)
LIB :: (