From fdc56c4d9a4af80e7572ba3380b9e8625ce42ce2 Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Tue, 24 Sep 2024 19:44:11 -0400 Subject: [PATCH 1/2] adding binding for static for linux --- vendor/glfw/bindings/bindings.odin | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index 81569f177..e273204f5 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -3,7 +3,7 @@ package glfw_bindings import "core:c" import vk "vendor:vulkan" -GLFW_SHARED :: #config(GLFW_SHARED, false) +GLFW_SHARED :: #config(GLFW_SHARED, ODIN_OS != .Windows && ODIN_OS != .Darwin) when ODIN_OS == .Windows { when GLFW_SHARED { @@ -38,7 +38,13 @@ when ODIN_OS == .Windows { } } } else { - foreign import glfw "system:glfw" + when GLFW_SHARED { + foreign import glfw "system:glfw" + } else { + foreign import glfw { + "../lib/libglfw3.a", + } + } } #assert(size_of(c.int) == size_of(b32)) From 3039131a5f6dd8a2b6b668069e94c501ff1b444a Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sun, 29 Sep 2024 07:46:01 -0400 Subject: [PATCH 2/2] do recommendation --- vendor/glfw/bindings/bindings.odin | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index e273204f5..a4be006b0 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -41,9 +41,13 @@ when ODIN_OS == .Windows { when GLFW_SHARED { foreign import glfw "system:glfw" } else { - foreign import glfw { - "../lib/libglfw3.a", + @(private) + LIBGLFW3 :: "../lib/libglfw3.a" + when !#exists(LIBGLFW3) { + #panic("Could not find the static glfw library, add it at \"" + ODIN_ROOT + "vendor/glfw/lib/\"`") } + + foreign import glfw { LIBGLFW3 } } }