diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2023-02-28 18:01:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 18:01:32 +0100 |
| commit | 3567c006e6683d989805c078db48a95a901d9e72 (patch) | |
| tree | 186f4f03c502172718ab8e7b64a60e04e858b736 | |
| parent | dfee7c103e1e24076fe35e1aeaffc6d0a7573c10 (diff) | |
| parent | b9db450a7d06d08d23bf959db3dc4e9c00466090 (diff) | |
Merge pull request #2356 from flysand7/master
Add option to link to glfw3 dynamically
| -rw-r--r-- | vendor/glfw/bindings/bindings.odin | 23 | ||||
| -rw-r--r-- | vendor/glfw/constants.odin | 3 | ||||
| -rw-r--r-- | vendor/glfw/native_windows.odin | 6 |
3 files changed, 25 insertions, 7 deletions
diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index e7287e316..96a70db85 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -3,13 +3,24 @@ package glfw_bindings import "core:c" import vk "vendor:vulkan" +GLFW_DYNAMIC :: #config(GLFW_DYNAMIC, false) + when ODIN_OS == .Windows { - foreign import glfw { - "../lib/glfw3_mt.lib", - "system:user32.lib", - "system:gdi32.lib", - "system:shell32.lib", - } + when GLFW_DYNAMIC { + foreign import glfw { + "../lib/glfw3dll.lib", + "system:user32.lib", + "system:gdi32.lib", + "system:shell32.lib", + } + } else { + foreign import glfw { + "../lib/glfw3_mt.lib", + "system:user32.lib", + "system:gdi32.lib", + "system:shell32.lib", + } + } } else when ODIN_OS == .Linux { // TODO: Add the billion-or-so static libs to link to in linux foreign import glfw "system:glfw" diff --git a/vendor/glfw/constants.odin b/vendor/glfw/constants.odin index ec1364e07..160642bfb 100644 --- a/vendor/glfw/constants.odin +++ b/vendor/glfw/constants.odin @@ -1,5 +1,8 @@ package glfw +/* Config */ +GLFW_DYNAMIC :: #config(GLFW_DYNAMIC, false) + /*** Constants ***/ /* Versions */ VERSION_MAJOR :: 3 diff --git a/vendor/glfw/native_windows.odin b/vendor/glfw/native_windows.odin index 1d9c3af86..26f75845c 100644 --- a/vendor/glfw/native_windows.odin +++ b/vendor/glfw/native_windows.odin @@ -4,7 +4,11 @@ package glfw import win32 "core:sys/windows" -foreign import glfw { "lib/glfw3_mt.lib", "system:user32.lib", "system:gdi32.lib", "system:shell32.lib" } +when GLFW_DYNAMIC { + foreign import glfw { "lib/glfw3dll.lib", "system:user32.lib", "system:gdi32.lib", "system:shell32.lib" } +} else { + foreign import glfw { "lib/glfw3_mt.lib", "system:user32.lib", "system:gdi32.lib", "system:shell32.lib" } +} @(default_calling_convention="c", link_prefix="glfw") foreign glfw { |