From df4dadc29d113598265c4c53ca1cad39bfe6fb77 Mon Sep 17 00:00:00 2001 From: Rokas Puzonas Date: Sat, 2 Sep 2023 22:31:23 +0300 Subject: [PATCH] add raylib-zig as a proper submodule --- .gitmodules | 3 +++ build.zig | 8 +++----- raylib-zig => libs/raylib-zig | 0 src/main.zig | 6 ++++-- 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .gitmodules rename raylib-zig => libs/raylib-zig (100%) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bad17c2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libs/raylib-zig"] + path = libs/raylib-zig + url = git@github.com:Not-Nik/raylib-zig.git diff --git a/build.zig b/build.zig index 50fadb9..50633e5 100644 --- a/build.zig +++ b/build.zig @@ -1,11 +1,9 @@ const std = @import("std"); -const rl = @import("raylib-zig/build.zig"); +const rl = @import("libs/raylib-zig/build.zig"); pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - var raylib = rl.getModule(b, "raylib-zig"); - var raylib_math = rl.math.getModule(b, "raylib-zig"); // TODO: Figure out how to build project for WASM. Tried to do it but standard memory allocators // didn't work. @@ -34,8 +32,8 @@ pub fn build(b: *std.Build) !void { const exe = b.addExecutable(.{ .name = "chip8-zig", .root_source_file = .{ .path = "src/main.zig" }, .optimize = optimize, .target = target }); rl.link(b, exe, target, optimize); - exe.addModule("raylib", raylib); - exe.addModule("raylib-math", raylib_math); + exe.addModule("raylib", rl.getModule(b, "libs/raylib-zig")); + exe.addModule("raylib-math", rl.math.getModule(b, "libs/raylib-zig")); const run_cmd = b.addRunArtifact(exe); const run_step = b.step("run", "Run chip8-zig"); diff --git a/raylib-zig b/libs/raylib-zig similarity index 100% rename from raylib-zig rename to libs/raylib-zig diff --git a/src/main.zig b/src/main.zig index 29dfa10..879c563 100755 --- a/src/main.zig +++ b/src/main.zig @@ -1,9 +1,11 @@ const rl = @import("raylib"); const std = @import("std"); -const assert = @import("std").debug.assert; + const ChipContext = @import("chip.zig"); const RaylibChip = @import("raylib-chip.zig"); +const assert = std.debug.assert; + pub fn gen_sin_wave(wave: *rl.Wave, frequency: f32) void { assert(wave.sampleSize == 16); // Only 16 bits are supported @@ -24,7 +26,7 @@ fn megabytes(amount: usize) usize { } pub fn main() anyerror!void { - var program_memory = try std.heap.page_allocator.alloc(u8, megabytes(1)); + var program_memory = try std.heap.page_allocator.alloc(u8, megabytes(2)); var fba = std.heap.FixedBufferAllocator.init(program_memory); const allocator = fba.allocator();