From b2b88f1d99c497f152485869b3f155b965e813bc Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 20 Apr 2023 11:27:36 +0100 Subject: [PATCH] Unify `foreign import` for `vendor:sdl2` --- vendor/sdl2/sdl2.odin | 7 ++++--- vendor/sdl2/sdl_audio.odin | 6 ------ vendor/sdl2/sdl_blendmode.odin | 6 ------ vendor/sdl2/sdl_cpuinfo.odin | 6 ------ vendor/sdl2/sdl_events.odin | 6 ------ vendor/sdl2/sdl_gamecontroller.odin | 6 ------ vendor/sdl2/sdl_gesture_haptic.odin | 6 ------ vendor/sdl2/sdl_hints.odin | 6 ------ vendor/sdl2/sdl_joystick.odin | 6 ------ vendor/sdl2/sdl_keyboard.odin | 6 ------ vendor/sdl2/sdl_keycode.odin | 1 - vendor/sdl2/sdl_log.odin | 6 ------ vendor/sdl2/sdl_messagebox.odin | 6 ------ vendor/sdl2/sdl_metal.odin | 6 ------ vendor/sdl2/sdl_mouse.odin | 6 ------ vendor/sdl2/sdl_mutex.odin | 6 ------ vendor/sdl2/sdl_pixels.odin | 6 ------ vendor/sdl2/sdl_rect.odin | 6 ------ vendor/sdl2/sdl_render.odin | 6 ------ vendor/sdl2/sdl_rwops.odin | 6 ------ vendor/sdl2/sdl_stdinc.odin | 6 ------ vendor/sdl2/sdl_surface.odin | 6 ------ vendor/sdl2/sdl_system.odin | 6 ------ vendor/sdl2/sdl_syswm.odin | 6 ------ vendor/sdl2/sdl_thread.odin | 6 ------ vendor/sdl2/sdl_timer.odin | 6 ------ vendor/sdl2/sdl_touch.odin | 6 ------ vendor/sdl2/sdl_video.odin | 6 ------ vendor/sdl2/sdl_vulkan.odin | 6 ------ 29 files changed, 4 insertions(+), 166 deletions(-) diff --git a/vendor/sdl2/sdl2.odin b/vendor/sdl2/sdl2.odin index adf6dbd49..b3abce483 100644 --- a/vendor/sdl2/sdl2.odin +++ b/vendor/sdl2/sdl2.odin @@ -26,11 +26,13 @@ import "core:c" import "core:intrinsics" when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" + foreign import _lib "SDL2.lib" } else { - foreign import lib "system:SDL2" + foreign import _lib "system:SDL2" } +lib :: _lib + version :: struct { major: u8, /**< major version */ minor: u8, /**< minor version */ @@ -45,7 +47,6 @@ PATCHLEVEL :: 16 foreign lib { GetVersion :: proc(ver: ^version) --- GetRevision :: proc() -> cstring --- - } InitFlag :: enum u32 { diff --git a/vendor/sdl2/sdl_audio.odin b/vendor/sdl2/sdl_audio.odin index 28a59d947..914adc0df 100644 --- a/vendor/sdl2/sdl_audio.odin +++ b/vendor/sdl2/sdl_audio.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - /** * \brief Audio format flags. * diff --git a/vendor/sdl2/sdl_blendmode.odin b/vendor/sdl2/sdl_blendmode.odin index 4fde5111b..07aab1dec 100644 --- a/vendor/sdl2/sdl_blendmode.odin +++ b/vendor/sdl2/sdl_blendmode.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - /** * \brief The blend mode used in SDL_RenderCopy() and drawing operations. */ diff --git a/vendor/sdl2/sdl_cpuinfo.odin b/vendor/sdl2/sdl_cpuinfo.odin index c5175e4d5..4987bd092 100644 --- a/vendor/sdl2/sdl_cpuinfo.odin +++ b/vendor/sdl2/sdl_cpuinfo.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - /* This is a guess for the cacheline size used for padding. * Most x86 processors have a 64 byte cache line. * The 64-bit PowerPC processors have a 128 byte cache line. diff --git a/vendor/sdl2/sdl_events.odin b/vendor/sdl2/sdl_events.odin index 60daaea56..8710c4765 100644 --- a/vendor/sdl2/sdl_events.odin +++ b/vendor/sdl2/sdl_events.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - RELEASED :: 0 PRESSED :: 1 diff --git a/vendor/sdl2/sdl_gamecontroller.odin b/vendor/sdl2/sdl_gamecontroller.odin index 8772faa26..497da0836 100644 --- a/vendor/sdl2/sdl_gamecontroller.odin +++ b/vendor/sdl2/sdl_gamecontroller.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - GameController :: struct {} GameControllerType :: enum c.int { diff --git a/vendor/sdl2/sdl_gesture_haptic.odin b/vendor/sdl2/sdl_gesture_haptic.odin index a21e0df06..92b9d83d4 100644 --- a/vendor/sdl2/sdl_gesture_haptic.odin +++ b/vendor/sdl2/sdl_gesture_haptic.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - // Gesture GestureID :: distinct i64 diff --git a/vendor/sdl2/sdl_hints.odin b/vendor/sdl2/sdl_hints.odin index 913d4ea12..57b264c00 100644 --- a/vendor/sdl2/sdl_hints.odin +++ b/vendor/sdl2/sdl_hints.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - HINT_ACCELEROMETER_AS_JOYSTICK :: "SDL_ACCELEROMETER_AS_JOYSTICK" HINT_ALLOW_ALT_TAB_WHILE_GRABBED :: "SDL_ALLOW_ALT_TAB_WHILE_GRABBED" HINT_ALLOW_TOPMOST :: "SDL_ALLOW_TOPMOST" diff --git a/vendor/sdl2/sdl_joystick.odin b/vendor/sdl2/sdl_joystick.odin index 35ca5cdcc..d0d1d62a3 100644 --- a/vendor/sdl2/sdl_joystick.odin +++ b/vendor/sdl2/sdl_joystick.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - Joystick :: struct {} JoystickGUID :: struct { diff --git a/vendor/sdl2/sdl_keyboard.odin b/vendor/sdl2/sdl_keyboard.odin index f880286aa..077d5f102 100644 --- a/vendor/sdl2/sdl_keyboard.odin +++ b/vendor/sdl2/sdl_keyboard.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - Keysym :: struct { scancode: Scancode, /**< SDL physical key code - see ::SDL_Scancode for details */ sym: Keycode, /**< SDL virtual key code - see ::SDL_Keycode for details */ diff --git a/vendor/sdl2/sdl_keycode.odin b/vendor/sdl2/sdl_keycode.odin index c03fdc2a9..466d8c2a6 100644 --- a/vendor/sdl2/sdl_keycode.odin +++ b/vendor/sdl2/sdl_keycode.odin @@ -1,6 +1,5 @@ package sdl2 - SCANCODE_MASK :: 1<<30 SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> Keycode { return Keycode(i32(X) | SCANCODE_MASK) diff --git a/vendor/sdl2/sdl_log.odin b/vendor/sdl2/sdl_log.odin index 09b7eaef0..a1db184c9 100644 --- a/vendor/sdl2/sdl_log.odin +++ b/vendor/sdl2/sdl_log.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - MAX_LOG_MESSAGE :: 4096 LogCategory :: enum c.int { diff --git a/vendor/sdl2/sdl_messagebox.odin b/vendor/sdl2/sdl_messagebox.odin index 6228704ac..2c8e8da48 100644 --- a/vendor/sdl2/sdl_messagebox.odin +++ b/vendor/sdl2/sdl_messagebox.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - MessageBoxFlag :: enum u32 { _ = 0, ERROR = 4, /**< error dialog */ diff --git a/vendor/sdl2/sdl_metal.odin b/vendor/sdl2/sdl_metal.odin index 1eccf7f5a..ca7bd91d2 100644 --- a/vendor/sdl2/sdl_metal.odin +++ b/vendor/sdl2/sdl_metal.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - MetalView :: distinct rawptr @(default_calling_convention="c", link_prefix="SDL_") diff --git a/vendor/sdl2/sdl_mouse.odin b/vendor/sdl2/sdl_mouse.odin index 0243b6623..a612a15a1 100644 --- a/vendor/sdl2/sdl_mouse.odin +++ b/vendor/sdl2/sdl_mouse.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - Cursor :: struct {} BUTTON :: #force_inline proc "c" (X: c.int) -> c.int { return 1 << u32(X-1) } diff --git a/vendor/sdl2/sdl_mutex.odin b/vendor/sdl2/sdl_mutex.odin index 1fd5849e0..54d8fc671 100644 --- a/vendor/sdl2/sdl_mutex.odin +++ b/vendor/sdl2/sdl_mutex.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - MUTEX_TIMEDOUT :: 1 MUTEX_MAXWAIT :: ~u32(0) diff --git a/vendor/sdl2/sdl_pixels.odin b/vendor/sdl2/sdl_pixels.odin index 8ee06aa1a..d526e86ba 100644 --- a/vendor/sdl2/sdl_pixels.odin +++ b/vendor/sdl2/sdl_pixels.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - ALPHA_OPAQUE :: 255 ALPHA_TRANSPARENT :: 0 diff --git a/vendor/sdl2/sdl_rect.odin b/vendor/sdl2/sdl_rect.odin index 852309cd2..de6a0848f 100644 --- a/vendor/sdl2/sdl_rect.odin +++ b/vendor/sdl2/sdl_rect.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - Point :: struct { x: c.int, y: c.int, diff --git a/vendor/sdl2/sdl_render.odin b/vendor/sdl2/sdl_render.odin index f948b39b0..a7b90e61a 100644 --- a/vendor/sdl2/sdl_render.odin +++ b/vendor/sdl2/sdl_render.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - RendererFlag :: enum u32 { SOFTWARE = 0, /**< The renderer is a software fallback */ ACCELERATED = 1, /**< The renderer uses hardware acceleration */ diff --git a/vendor/sdl2/sdl_rwops.odin b/vendor/sdl2/sdl_rwops.odin index 86fb23c75..7add9b2f0 100644 --- a/vendor/sdl2/sdl_rwops.odin +++ b/vendor/sdl2/sdl_rwops.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - /* RWops Types */ RWOPS_UNKNOWN :: 0 /**< Unknown stream type */ RWOPS_WINFILE :: 1 /**< Win32 file */ diff --git a/vendor/sdl2/sdl_stdinc.odin b/vendor/sdl2/sdl_stdinc.odin index 97722f4fe..178007919 100644 --- a/vendor/sdl2/sdl_stdinc.odin +++ b/vendor/sdl2/sdl_stdinc.odin @@ -5,12 +5,6 @@ import "core:intrinsics" import "core:runtime" _, _ :: intrinsics, runtime -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - bool :: distinct b32 #assert(size_of(bool) == size_of(c.int)) diff --git a/vendor/sdl2/sdl_surface.odin b/vendor/sdl2/sdl_surface.odin index f50de35f7..a36131a42 100644 --- a/vendor/sdl2/sdl_surface.odin +++ b/vendor/sdl2/sdl_surface.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - SWSURFACE :: 0 /**< Just here for compatibility */ PREALLOC :: 0x00000001 /**< Surface uses preallocated memory */ RLEACCEL :: 0x00000002 /**< Surface is RLE encoded */ diff --git a/vendor/sdl2/sdl_system.odin b/vendor/sdl2/sdl_system.odin index d9b6b98df..b8787624e 100644 --- a/vendor/sdl2/sdl_system.odin +++ b/vendor/sdl2/sdl_system.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - // General @(default_calling_convention="c", link_prefix="SDL_") foreign lib { diff --git a/vendor/sdl2/sdl_syswm.odin b/vendor/sdl2/sdl_syswm.odin index 62ca9d628..5dc50c394 100644 --- a/vendor/sdl2/sdl_syswm.odin +++ b/vendor/sdl2/sdl_syswm.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - SYSWM_TYPE :: enum c.int { UNKNOWN, WINDOWS, diff --git a/vendor/sdl2/sdl_thread.odin b/vendor/sdl2/sdl_thread.odin index 5d1c0bd37..8acc71849 100644 --- a/vendor/sdl2/sdl_thread.odin +++ b/vendor/sdl2/sdl_thread.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - Thread :: struct {} threadID :: distinct c.ulong diff --git a/vendor/sdl2/sdl_timer.odin b/vendor/sdl2/sdl_timer.odin index d71ed2da5..6b19a6c13 100644 --- a/vendor/sdl2/sdl_timer.odin +++ b/vendor/sdl2/sdl_timer.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - TimerCallback :: proc "c" (interval: u32, param: rawptr) -> u32 TimerID :: distinct c.int diff --git a/vendor/sdl2/sdl_touch.odin b/vendor/sdl2/sdl_touch.odin index f2a8cc695..3ba59b651 100644 --- a/vendor/sdl2/sdl_touch.odin +++ b/vendor/sdl2/sdl_touch.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - TouchID :: distinct i64 FingerID :: distinct i64 diff --git a/vendor/sdl2/sdl_video.odin b/vendor/sdl2/sdl_video.odin index 86b564541..6f4deaf3f 100644 --- a/vendor/sdl2/sdl_video.odin +++ b/vendor/sdl2/sdl_video.odin @@ -2,12 +2,6 @@ package sdl2 import "core:c" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - DisplayMode :: struct { format: u32, /**< pixel format */ w: c.int, /**< width, in screen coordinates */ diff --git a/vendor/sdl2/sdl_vulkan.odin b/vendor/sdl2/sdl_vulkan.odin index 33bb8e51c..2258682c0 100644 --- a/vendor/sdl2/sdl_vulkan.odin +++ b/vendor/sdl2/sdl_vulkan.odin @@ -3,12 +3,6 @@ package sdl2 import "core:c" import vk "vendor:vulkan" -when ODIN_OS == .Windows { - foreign import lib "SDL2.lib" -} else { - foreign import lib "system:SDL2" -} - VkInstance :: vk.Instance VkSurfaceKHR :: vk.SurfaceKHR