nathanmcrae/docmap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to latest zig

Browse Source
This commit is contained in:
Andrew Kelley 2018-06-09 23:13:57 -04:00
parent 2dd7e5b51e
commit a4c4a42e0a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.zig
View File

@ -1,6 +1,6 @@
const Builder = @import("std").build.Builder; const Builder = @import("std").build.Builder;
pub fn build(b: &Builder) void { pub fn build(b: *Builder) void {
const mode = b.standardReleaseOptions(); const mode = b.standardReleaseOptions();
const exe = b.addExecutable("sdl-zig-demo", "src/main.zig"); const exe = b.addExecutable("sdl-zig-demo", "src/main.zig");
exe.setBuildMode(mode); exe.setBuildMode(mode);

8
src/main.zig
View File

@ -10,7 +10,7 @@ const assert = @import("std").debug.assert;
// SDL_video.h:#define SDL_WINDOWPOS_UNDEFINED_MASK 0x1FFF0000u // SDL_video.h:#define SDL_WINDOWPOS_UNDEFINED_MASK 0x1FFF0000u
const SDL_WINDOWPOS_UNDEFINED = @bitCast(c_int, c.SDL_WINDOWPOS_UNDEFINED_MASK); const SDL_WINDOWPOS_UNDEFINED = @bitCast(c_int, c.SDL_WINDOWPOS_UNDEFINED_MASK);
extern fn SDL_PollEvent(event: &c.SDL_Event) c_int; extern fn SDL_PollEvent(event: *c.SDL_Event) c_int;
// SDL_RWclose is fundamentally unrepresentable in Zig, because `ctx` is // SDL_RWclose is fundamentally unrepresentable in Zig, because `ctx` is
// evaluated twice. One could make the case that this is a bug in SDL, // evaluated twice. One could make the case that this is a bug in SDL,
@ -20,8 +20,8 @@ extern fn SDL_PollEvent(event: &c.SDL_Event) c_int;
// it would resolve the SDL bug as well as make the function visible to Zig // it would resolve the SDL bug as well as make the function visible to Zig
// and to debuggers. // and to debuggers.
// SDL_rwops.h:#define SDL_RWclose(ctx) (ctx)->close(ctx) // SDL_rwops.h:#define SDL_RWclose(ctx) (ctx)->close(ctx)
inline fn SDL_RWclose(ctx: &c.SDL_RWops) c_int { inline fn SDL_RWclose(ctx: [*]c.SDL_RWops) c_int {
return (??ctx.close)(ctx); return ctx[0].close.?(ctx);
} }
pub fn main() !void { pub fn main() !void {
@ -49,7 +49,7 @@ pub fn main() !void {
defer c.SDL_DestroyRenderer(renderer); defer c.SDL_DestroyRenderer(renderer);
const zig_bmp = @embedFile("zig.bmp"); const zig_bmp = @embedFile("zig.bmp");
const rw = c.SDL_RWFromConstMem(@ptrCast(&const c_void, &zig_bmp[0]), c_int(zig_bmp.len)) ?? { const rw = c.SDL_RWFromConstMem(@ptrCast(*const c_void, &zig_bmp[0]), c_int(zig_bmp.len)) ?? {
c.SDL_Log(c"Unable to get RWFromConstMem: %s", c.SDL_GetError()); c.SDL_Log(c"Unable to get RWFromConstMem: %s", c.SDL_GetError());
return error.SDLInitializationFailed; return error.SDLInitializationFailed;
}; };