diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2023-10-31 12:16:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 12:16:25 +0000 |
| commit | eb261f5b28a8d3cddc3dc21441f33775bb3ced95 (patch) | |
| tree | 55014f5e1ffe0c099376699945a1800cc4d16246 /examples | |
| parent | bbd4c1054e18f18e934828b5160efce076027d1e (diff) | |
| parent | f5febb633c92ee1cf7b5d88f0146ffac3e2481b7 (diff) | |
Merge branch 'master' into new-sys-unix
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/all/all_vendor.odin | 13 | ||||
| -rw-r--r-- | examples/all/all_vendor_darwin.odin | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/examples/all/all_vendor.odin b/examples/all/all_vendor.odin index 9cc915778..6864a7be2 100644 --- a/examples/all/all_vendor.odin +++ b/examples/all/all_vendor.odin @@ -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 diff --git a/examples/all/all_vendor_darwin.odin b/examples/all/all_vendor_darwin.odin new file mode 100644 index 000000000..9aa41396c --- /dev/null +++ b/examples/all/all_vendor_darwin.odin @@ -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 |