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

Merge pull request #2356 from flysand7/master

Browse Source 
Add option to link to glfw3 dynamically
This commit is contained in:
Jeroen van Rijn
2023-02-28 18:01:32 +01:00
committed by GitHub
parent dfee7c103e b9db450a7d
commit 3567c006e6
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/glfw/bindings/bindings.odin
Vendored
+17 -6
View File
@@ -3,13 +3,24 @@ package glfw_bindings
import "core:c" import "core:c"
import vk "vendor:vulkan" import vk "vendor:vulkan"
GLFW_DYNAMIC :: #config(GLFW_DYNAMIC, false)
when ODIN_OS == .Windows { when ODIN_OS == .Windows {
foreign import glfw { when GLFW_DYNAMIC {
"../lib/glfw3_mt.lib", foreign import glfw {
"system:user32.lib", "../lib/glfw3dll.lib",
"system:gdi32.lib", "system:user32.lib",
"system:shell32.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 { } else when ODIN_OS == .Linux {
// TODO: Add the billion-or-so static libs to link to in linux // TODO: Add the billion-or-so static libs to link to in linux
foreign import glfw "system:glfw" foreign import glfw "system:glfw"
vendor/glfw/constants.odin
Vendored
+3
View File
@@ -1,5 +1,8 @@
package glfw package glfw
/* Config */
GLFW_DYNAMIC :: #config(GLFW_DYNAMIC, false)
/*** Constants ***/ /*** Constants ***/
/* Versions */ /* Versions */
VERSION_MAJOR :: 3 VERSION_MAJOR :: 3
vendor/glfw/native_windows.odin
Vendored
+5 -1
View File
@@ -4,7 +4,11 @@ package glfw
import win32 "core:sys/windows" 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") @(default_calling_convention="c", link_prefix="glfw")
foreign glfw { foreign glfw {