diff --git a/core/runtime/default_allocators_general.odin b/core/runtime/default_allocators_general.odin index 732cb11b5..994a672b0 100644 --- a/core/runtime/default_allocators_general.odin +++ b/core/runtime/default_allocators_general.odin @@ -4,13 +4,16 @@ //+build !js package runtime +// TODO(bill): reimplement these procedures in the os_specific stuff +import "core:os" + when ODIN_DEFAULT_TO_NIL_ALLOCATOR { + _ :: os + // mem.nil_allocator reimplementation default_allocator_proc :: nil_allocator_proc default_allocator :: nil_allocator } else { - // TODO(bill): reimplement these procedures in the os_specific stuff - import "core:os" default_allocator_proc :: os.heap_allocator_proc diff --git a/vendor/OpenGL/helpers.odin b/vendor/OpenGL/helpers.odin index 900710f3d..82b69b9ae 100644 --- a/vendor/OpenGL/helpers.odin +++ b/vendor/OpenGL/helpers.odin @@ -5,7 +5,9 @@ package vendor_gl import "core:os" import "core:fmt" import "core:strings" +import "core:runtime" _ :: fmt +_ :: runtime Shader_Type :: enum i32 { NONE = 0x0000, @@ -47,8 +49,6 @@ get_last_error_message :: proc() -> (compile_message: string, compile_type: Shad // except for calling differently named GL functions // it's a bit ugly looking, but meh when GL_DEBUG { - import "core:runtime" - @private check_error :: proc( id: u32, type: Shader_Type, status: u32, diff --git a/vendor/OpenGL/wrappers.odin b/vendor/OpenGL/wrappers.odin index 46511c7d7..e17b0eb3c 100644 --- a/vendor/OpenGL/wrappers.odin +++ b/vendor/OpenGL/wrappers.odin @@ -2,6 +2,11 @@ package vendor_gl #assert(size_of(bool) == size_of(u8)) +import "core:runtime" +import "core:fmt" +_ :: runtime +_ :: fmt + when !GL_DEBUG { // VERSION_1_0 CullFace :: proc "c" (mode: u32) { impl_CullFace(mode) } @@ -756,9 +761,6 @@ when !GL_DEBUG { MultiDrawElementsIndirectCount :: proc "c" (mode: i32, type: i32, indirect: [^]DrawElementsIndirectCommand, drawcount: i32, maxdrawcount, stride: i32) { impl_MultiDrawElementsIndirectCount(mode, type, indirect, drawcount, maxdrawcount, stride) } PolygonOffsetClamp :: proc "c" (factor, units, clamp: f32) { impl_PolygonOffsetClamp(factor, units, clamp) } } else { - import "core:runtime" - import "core:fmt" - debug_helper :: proc"c"(from_loc: runtime.Source_Code_Location, num_ret: int, args: ..any, loc := #caller_location) { context = runtime.default_context() diff --git a/vendor/darwin/Foundation/NSNumber.odin b/vendor/darwin/Foundation/NSNumber.odin index 99b281307..b3124885f 100644 --- a/vendor/darwin/Foundation/NSNumber.odin +++ b/vendor/darwin/Foundation/NSNumber.odin @@ -1,9 +1,8 @@ package objc_Foundation +import "core:c" +_ :: c when ODIN_OS == .Darwin { - import "core:c" - _ :: c - #assert(size_of(c.long) == size_of(int)) #assert(size_of(c.ulong) == size_of(uint)) } diff --git a/vendor/miniaudio/common.odin b/vendor/miniaudio/common.odin index 1d64dc182..54b30c057 100644 --- a/vendor/miniaudio/common.odin +++ b/vendor/miniaudio/common.odin @@ -276,30 +276,6 @@ thread_priority :: enum c.int { realtime = 1, default = 0, } - - -when ODIN_OS == .Windows { - thread :: distinct rawptr - mutex :: distinct rawptr - event :: distinct rawptr - semaphore :: distinct rawptr -} else { - import "core:sys/unix" - - thread :: unix.pthread_t - mutex :: unix.pthread_mutex_t - event :: struct { - value: u32, - lock: unix.pthread_mutex_t, - cond: unix.pthread_cond_t, - } - semaphore :: struct { - value: c.int, - lock: unix.pthread_mutex_t, - cond: unix.pthread_cond_t, - } -} - } /* NO_THREADING */ diff --git a/vendor/miniaudio/common_unix.odin b/vendor/miniaudio/common_unix.odin new file mode 100644 index 000000000..494455e97 --- /dev/null +++ b/vendor/miniaudio/common_unix.odin @@ -0,0 +1,17 @@ +//+build !windows +package miniaudio + +import "core:sys/unix" + +thread :: unix.pthread_t +mutex :: unix.pthread_mutex_t +event :: struct { + value: u32, + lock: unix.pthread_mutex_t, + cond: unix.pthread_cond_t, +} +semaphore :: struct { + value: c.int, + lock: unix.pthread_mutex_t, + cond: unix.pthread_cond_t, +} diff --git a/vendor/miniaudio/common_windows.odin b/vendor/miniaudio/common_windows.odin new file mode 100644 index 000000000..013fc56f9 --- /dev/null +++ b/vendor/miniaudio/common_windows.odin @@ -0,0 +1,6 @@ +package miniaudio + +thread :: distinct rawptr +mutex :: distinct rawptr +event :: distinct rawptr +semaphore :: distinct rawptr diff --git a/vendor/raylib/raylib.odin b/vendor/raylib/raylib.odin index 4236839f0..5576a0915 100644 --- a/vendor/raylib/raylib.odin +++ b/vendor/raylib/raylib.odin @@ -87,9 +87,8 @@ import "core:mem" import "core:strings" USE_LINALG :: #config(RAYLIB_USE_LINALG, true) -when USE_LINALG { - import "core:math/linalg" -} +import "core:math/linalg" +_ :: linalg MAX_TEXTFORMAT_BUFFERS :: #config(RAYLIB_MAX_TEXTFORMAT_BUFFERS, 4) MAX_TEXT_BUFFER_LENGTH :: #config(RAYLIB_MAX_TEXT_BUFFER_LENGTH, 1024) diff --git a/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py b/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py index c3497aa8f..c4c01fc7b 100644 --- a/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py +++ b/vendor/vulkan/_gen/create_vulkan_odin_wrapper.py @@ -829,9 +829,9 @@ with open("../structs.odin", 'w', encoding='utf-8') as f: f.write(""" import "core:c" +import win32 "core:sys/windows" +_ :: win32 when ODIN_OS == .Windows { -\timport win32 "core:sys/windows" - \tHINSTANCE :: win32.HINSTANCE \tHWND :: win32.HWND \tHMONITOR :: win32.HMONITOR diff --git a/vendor/vulkan/structs.odin b/vendor/vulkan/structs.odin index b04c90203..d948f52b9 100644 --- a/vendor/vulkan/structs.odin +++ b/vendor/vulkan/structs.odin @@ -5,9 +5,9 @@ package vulkan import "core:c" +import win32 "core:sys/windows" +_ :: win32 when ODIN_OS == .Windows { - import win32 "core:sys/windows" - HINSTANCE :: win32.HINSTANCE HWND :: win32.HWND HMONITOR :: win32.HMONITOR