diff --git a/.gitmodules b/.gitmodules index eeb9fe5..e746f0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "libs/raylib-zig"] - path = libs/raylib-zig - url = git@github.com:Not-Nik/raylib-zig.git [submodule "libs/raylib"] path = libs/raylib url = https://github.com/ryupold/raylib.zig diff --git a/build.zig b/build.zig index b88e6d9..b0a26ec 100644 --- a/build.zig +++ b/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -// const rl = @import("libs/raylib-zig/build.zig"); const raylib = @import("libs/raylib/build.zig"); pub fn build(b: *std.Build) !void { @@ -9,28 +8,12 @@ pub fn build(b: *std.Build) !void { // TODO: Figure out how to build project for WASM. Tried to do it but standard memory allocators // didn't work. - //web exports are completely separate - // if (target.getOsTag() == .emscripten) { - // const exe_lib = rl.compileForEmscripten(b, "chip8-zig", "src/main.zig", target, optimize); - // exe_lib.addModule("raylib", raylib); - // exe_lib.addModule("raylib-math", raylib_math); - // - // const raylib_artifact = rl.getArtifact(b, target, optimize); - // // Note that raylib itself is not actually added to the exe_lib output file, so it also needs to be linked with emscripten. - // exe_lib.linkLibrary(raylib_artifact); - // - // const link_step = try rl.linkWithEmscripten(b, &[_]*std.Build.Step.Compile{ exe_lib, raylib_artifact }); - // b.getInstallStep().dependOn(&link_step.step); - // - // const run_step = try rl.emscriptenRunStep(b); - // run_step.step.dependOn(&link_step.step); - // - // const run_option = b.step("run", "Run chip8-zig"); - // run_option.dependOn(&run_step.step); - // return; - // } - - const exe = b.addExecutable(.{ .name = "chip8-zig", .root_source_file = .{ .path = "src/main.zig" }, .optimize = optimize, .target = target }); + const exe = b.addExecutable(.{ + .name = "chip8-zig", + .root_source_file = .{ .path = "src/main.zig" }, + .optimize = optimize, + .target = target + }); // Provide filenames of all files in 'src/ROMs' to program as options { @@ -52,10 +35,6 @@ pub fn build(b: *std.Build) !void { raylib.addTo(b, exe, target, optimize); - // rl.link(b, exe, target, optimize); - // exe.addModule("raylib", rl.getModule(b, "libs/raylib-zig")); - // exe.addModule("raylib-math", rl.math.getModule(b, "libs/raylib-zig")); - { var build_models_step = b.step("models", "Export .blend files"); var build_models = b.addSystemCommand(&[_][]const u8{ "blender" }); diff --git a/libs/raylib-zig b/libs/raylib-zig deleted file mode 160000 index a106b99..0000000 --- a/libs/raylib-zig +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a106b9968fab5eae97a8f9fc85e0379358642c8d