Merge branch 'master' into new-sys-unix

This commit is contained in:
gingerBill
2023-10-31 12:16:25 +00:00
committed by GitHub
64 changed files with 739 additions and 101 deletions

View File

@@ -39,14 +39,6 @@ import TTF "vendor:sdl2/ttf"
import vk "vendor:vulkan"
// NOTE(flysand): Since conditional imports are disabled for now I'll have to just disable these
// when ODIN_OS == "darwin" {
// import NS "vendor:darwin/Foundation"
// import MTL "vendor:darwin/Metal"
// import MTK "vendor:darwin/MetalKit"
// import CA "vendor:darwin/QuartzCore"
// }
// NOTE(bill): only one can be checked at a time
import lua_5_4 "vendor:lua/5.4"
@@ -94,11 +86,6 @@ _ :: TTF
_ :: vk
// _ :: NS
// _ :: MTL
// _ :: MTK
// _ :: CA
_ :: lua_5_4
_ :: nvg

View File

@@ -0,0 +1,12 @@
//+build darwin
package all
import NS "vendor:darwin/Foundation"
import MTL "vendor:darwin/Metal"
import MTK "vendor:darwin/MetalKit"
import CA "vendor:darwin/QuartzCore"
_ :: NS
_ :: MTL
_ :: MTK
_ :: CA