diff --git a/.gitattributes b/.gitattributes index 07d705f0d..26001c57c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -31,3 +31,4 @@ vendor/raylib/v6/windows/raygui.dll filter=lfs diff=lfs merge=lfs -text vendor/raylib/v6/windows/raygui.lib filter=lfs diff=lfs merge=lfs -text vendor/raylib/v6/windows/rayguidll.lib filter=lfs diff=lfs merge=lfs -text vendor/box3d/lib/linux-amd64/libbox3d.a filter=lfs diff=lfs merge=lfs -text +vendor/box3d/lib/darwin/libbox3d.a filter=lfs diff=lfs merge=lfs -text diff --git a/vendor/box3d/box3d.odin b/vendor/box3d/box3d.odin index ca5221210..834592c82 100644 --- a/vendor/box3d/box3d.odin +++ b/vendor/box3d/box3d.odin @@ -19,6 +19,11 @@ when ODIN_OS == .Windows { foreign import lib { "lib/linux-amd64/libbox3d.a", } +} else when ODIN_OS == .Darwin && (ODIN_ARCH == .arm64 || ODIN_ARCH == .amd64) && !BOX3D_SHARED { + @(export) + foreign import lib { + "lib/darwin/libbox3d.a", + } } else { @(export) foreign import lib { diff --git a/vendor/box3d/lib/darwin/README.md b/vendor/box3d/lib/darwin/README.md new file mode 100644 index 000000000..5ebbd2102 --- /dev/null +++ b/vendor/box3d/lib/darwin/README.md @@ -0,0 +1,10 @@ +# Box3D MacOS build + +Build steps: + +``` +cmake --preset macos -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" +cmake --build --preset macos-release -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" +``` + +This makes a fat binary that works on ARM and Intel MacOS. And it sets the target (`-minimum-os-version` in Odin) to 11.0 (Odin's default). diff --git a/vendor/box3d/lib/darwin/libbox3d.a b/vendor/box3d/lib/darwin/libbox3d.a new file mode 100644 index 000000000..a3627ca45 --- /dev/null +++ b/vendor/box3d/lib/darwin/libbox3d.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b43006bed07643d6a35a71d5bf8b7176ba4e231085d7c78a0987f27b3d9510dd +size 2150728