Browse Source

Merge pull request #1447 from phillvancejr/master

Added vendor glfw support for Mac OS
Jeroen van Rijn 3 years ago
parent
commit
2e895c72d3

+ 7 - 0
vendor/glfw/bindings/bindings.odin

@@ -13,6 +13,13 @@ 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",
+    	}
 } else {
 	foreign import glfw "system:glfw"
 }

BIN
vendor/glfw/lib/darwin/libglfw3.a


+ 1 - 1
vendor/stb/image/stb_image_resize.odin

@@ -185,4 +185,4 @@ foreign lib {
 	                      space: colorspace, alloc_context: rawptr,
 	                      s0, t0, s1, t1: f32) -> c.int ---
 	
-}
+}

BIN
vendor/stb/lib/darwin/libstb_image.a


BIN
vendor/stb/lib/darwin/stb_image.a


BIN
vendor/stb/lib/darwin/stb_image_resize.a


BIN
vendor/stb/lib/darwin/stb_image_write.a


BIN
vendor/stb/lib/darwin/stb_rect_pack.a


BIN
vendor/stb/lib/darwin/stb_truetype.a