Merge pull request #377 from guzba/master

update nimble bindings on mac
This commit is contained in:
treeform 2022-02-06 13:10:04 -08:00 committed by GitHub
commit b37939a717
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View file

@ -22,8 +22,8 @@ task bindings, "Generate bindings":
compile "pixie.dll" compile "pixie.dll"
elif defined(macosx): elif defined(macosx):
compile "libpixie.dylib.arm", "-l:'-target arm64-apple-macos11' -t:'-target arm64-apple-macos11'" compile "libpixie.dylib.arm", "--cpu:arm64 -l:'-target arm64-apple-macos11' -t:'-target arm64-apple-macos11'"
compile "libpixie.dylib.x64", "-l:'-target x86_64-apple-macos10.12' -t:'-target x86_64-apple-macos10.12'" compile "libpixie.dylib.x64", "--cpu:amd64 -l:'-target x86_64-apple-macos10.12' -t:'-target x86_64-apple-macos10.12'"
exec "lipo bindings/generated/libpixie.dylib.arm bindings/generated/libpixie.dylib.x64 -output bindings/generated/libpixie.dylib -create" exec "lipo bindings/generated/libpixie.dylib.arm bindings/generated/libpixie.dylib.x64 -output bindings/generated/libpixie.dylib -create"
else: else:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 441 B

View file

@ -297,14 +297,14 @@ block:
let draws = [ let draws = [
# Overlaps in bounds # Overlaps in bounds
(vec2(-50, -50), color(1, 0, 0, 1)), (vec2(-50, -50), color(1, 0, 0, 1)),
(vec2(50, -50), color(1, 0, 0, 1)), (vec2(50, -50), color(0, 1, 0, 1)),
(vec2(50, 50), color(1, 0, 0, 1)), (vec2(50, 50), color(0, 0, 1, 1)),
(vec2(-50, 50), color(1, 0, 0, 1)), (vec2(-50, 50), color(1, 1, 0, 1)),
# Out of bounds # Out of bounds
(vec2(-100, 00), color(1, 0, 0, 1)), (vec2(-100, 00), color(1, 0, 1, 1)),
(vec2(0, -100), color(1, 0, 0, 1)), (vec2(0, -100), color(0, 1, 1, 1)),
(vec2(100, 00), color(1, 0, 0, 1)), (vec2(100, 00), color(0.5, 0.5, 0.5, 1)),
(vec2(0, 100), color(1, 0, 0, 1)) (vec2(0, 100), color(0.75, 0.75, 0, 1))
] ]
for (translation, color) in draws: for (translation, color) in draws:
let let