Merge pull request #7 from der-teufel-programming/main
Update to latest master after Zig PR #18160
This commit is contained in:
commit
f87ab50709
4 changed files with 13 additions and 11 deletions
|
@ -4,7 +4,7 @@ pub fn build(b: *std.Build) void {
|
||||||
const optimize = b.standardOptimizeOption(.{});
|
const optimize = b.standardOptimizeOption(.{});
|
||||||
const target = b.standardTargetOptions(.{});
|
const target = b.standardTargetOptions(.{});
|
||||||
|
|
||||||
_ = b.addModule("objc", .{ .source_file = .{ .path = "src/main.zig" } });
|
_ = b.addModule("objc", .{ .root_source_file = .{ .path = "src/main.zig" } });
|
||||||
|
|
||||||
const tests = b.addTest(.{
|
const tests = b.addTest(.{
|
||||||
.name = "objc-test",
|
.name = "objc-test",
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
},
|
},
|
||||||
.dependencies = .{
|
.dependencies = .{
|
||||||
.macos_sdk = .{
|
.macos_sdk = .{
|
||||||
.url = "https://github.com/mitchellh/zig-build-macos-sdk/archive/7e50d6ea241403615d5ebc9f1df4680d3907fa92.tar.gz",
|
.url = "https://github.com/mitchellh/zig-build-macos-sdk/archive/4186e9fd445d12041651abe59ea5f396499b0844.tar.gz",
|
||||||
.hash = "1220eb266898413ecfe5aaf7f29cc17eb479d046adecc94ebc7d5e1e807d2aabdd70",
|
.hash = "1220bc2612b57b0cfaaecbcac38e3144e5a9362ff668d71eb8334e895047bdbb7148",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
14
flake.lock
generated
14
flake.lock
generated
|
@ -80,16 +80,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689088367,
|
"lastModified": 1702350026,
|
||||||
"narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=",
|
"narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8",
|
"rev": "9463103069725474698139ab10f17a9d125da859",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "release-23.05",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -109,11 +109,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700526194,
|
"lastModified": 1704500574,
|
||||||
"narHash": "sha256-/7C9bzFG0Gq/tBAbSwC84Dg5TNPomCcxIJJQNj3Y2BI=",
|
"narHash": "sha256-Ockm1D5QsxdVZZoD0Yf5Kg4FupbVnk3X0RLkc6geRIE=",
|
||||||
"owner": "mitchellh",
|
"owner": "mitchellh",
|
||||||
"repo": "zig-overlay",
|
"repo": "zig-overlay",
|
||||||
"rev": "2877b025231e96196469ee8a5b80799027b42e03",
|
"rev": "e056aafd8db157ff7519518a026c5ba7040522cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -200,7 +200,9 @@ fn BlockContext(comptime Captures: type, comptime InvokeFn: type) type {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const NSConcreteStackBlock = @extern(*anyopaque, .{ .name = "_NSConcreteStackBlock" });
|
// Pointer to opaque instead of anyopaque: https://github.com/ziglang/zig/issues/18461
|
||||||
|
const NSConcreteStackBlock = @extern(*opaque {}, .{ .name = "_NSConcreteStackBlock" });
|
||||||
|
|
||||||
extern "C" fn _Block_object_assign(dst: *anyopaque, src: *const anyopaque, flag: c_int) void;
|
extern "C" fn _Block_object_assign(dst: *anyopaque, src: *const anyopaque, flag: c_int) void;
|
||||||
extern "C" fn _Block_object_dispose(src: *const anyopaque, flag: c_int) void;
|
extern "C" fn _Block_object_dispose(src: *const anyopaque, flag: c_int) void;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue