From 977d3057140a80c47f35904dc5ede87de6349949 Mon Sep 17 00:00:00 2001 From: Blue Date: Wed, 16 Aug 2023 13:06:02 -0600 Subject: [PATCH] some final changes --- build.zig | 4 +--- project_setup.sh | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.zig b/build.zig index 5a32ef1..debc5c7 100755 --- a/build.zig +++ b/build.zig @@ -182,8 +182,7 @@ pub fn build(b: *std.Build) !void { const link_step = try linkWithEmscripten(b, &[_]*std.Build.Step.Compile{ exe_lib, raylib_artifact }); link_step.addArg("--embed-file"); link_step.addArg("resources/"); - link_step.step.dependOn(&raylib_artifact.step); - link_step.step.dependOn(&exe_lib.step); + const run_step = try emscriptenRunStep(b); run_step.step.dependOn(&link_step.step); const run_option = b.step(ex.name, ex.desc); @@ -249,7 +248,6 @@ pub fn compileForEmscripten(b: *std.Build, name: []const u8, root_source_file: [ // instead of passing every file individually. The entire path given will be the path to read the file within the program. // So, if "resources/image.png" is passed, your program will use "resources/image.png" as the path to load the file. // TODO: test if shared libraries are accepted, I don't remember if emcc can link a shared library with a project or not -// TODO: add a way to convert from an input path to the output path, if emscripten even allows such a thing. // TODO: add a parameter that allows a custom output directory pub fn linkWithEmscripten(b: *std.Build, itemsToLink: []const *std.Build.Step.Compile) !*std.Build.Step.Run { //Raylib uses --sysroot in order to find emscripten, so do the same here diff --git a/project_setup.sh b/project_setup.sh index 5b18cfd..9bf1408 100755 --- a/project_setup.sh +++ b/project_setup.sh @@ -26,8 +26,6 @@ pub fn build(b: *std.Build) !void { // 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 }); - link_step.step.dependOn(&raylib_artifact.step); - link_step.step.dependOn(&exe_lib.step); b.getInstallStep().dependOn(&link_step.step); const run_step = try rl.emscriptenRunStep(b); run_step.step.dependOn(&link_step.step);