add 'shared' config to vendor libraries

This commit is contained in:
flysand7
2023-10-14 21:21:34 +11:00
parent 77210ffa56
commit cf937c6341
15 changed files with 249 additions and 77 deletions
+6 -7
View File
@@ -22,15 +22,14 @@ when ODIN_OS == .Windows {
}
}
} else when ODIN_OS == .Linux {
// TODO: Add the billion-or-so static libs to link to in linux
foreign import glfw "system:glfw"
} else when ODIN_OS == .Darwin {
foreign import glfw {
"../lib/darwin/libglfw3.a",
"system:Cocoa.framework",
"system:IOKit.framework",
"system:OpenGL.framework",
}
foreign import glfw {
"../lib/darwin/libglfw3.a",
"system:Cocoa.framework",
"system:IOKit.framework",
"system:OpenGL.framework",
}
} else {
foreign import glfw "system:glfw"
}
+1 -1
View File
@@ -1,7 +1,7 @@
package glfw
/* Config */
GLFW_DYNAMIC :: #config(GLFW_DYNAMIC, false)
GLFW_SHARED :: #config(GLFW_SHARED, false)
/*** Constants ***/
/* Versions */
+8 -1
View File
@@ -4,7 +4,14 @@ package glfw
import NS "vendor:darwin/foundation"
foreign import glfw { "lib/darwin/libglfw3.a" }
when GLFW_SHARED {
#panic("Dynamic linking for glfw is not supported for darwin yet")
foreign import glfw {"_"}
} else {
foreign import glfw {
"lib/darwin/libglfw3.a"
}
}
@(default_calling_convention="c", link_prefix="glfw")
foreign glfw {
+13 -3
View File
@@ -4,10 +4,20 @@ package glfw
import win32 "core:sys/windows"
when GLFW_DYNAMIC {
foreign import glfw { "lib/glfw3dll.lib", "system:user32.lib", "system:gdi32.lib", "system:shell32.lib" }
when GLFW_SHARED {
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" }
foreign import glfw {
"lib/glfw3_mt.lib",
"system:user32.lib",
"system:gdi32.lib",
"system:shell32.lib"
}
}
@(default_calling_convention="c", link_prefix="glfw")