rpuzonas/chip8-zig
1
0
Fork 0
Code

remove raylib-zig

Browse Source
This commit is contained in:
Rokas Puzonas 2023-11-12 12:03:28 +02:00
parent d6ce6a9582
commit 4015f9fb98
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "libs/raylib-zig"]
path = libs/raylib-zig
url = git@github.com:Not-Nik/raylib-zig.git
[submodule "libs/raylib"] [submodule "libs/raylib"]
path = libs/raylib path = libs/raylib
url = https://github.com/ryupold/raylib.zig url = https://github.com/ryupold/raylib.zig

33
build.zig
View File

@ -1,5 +1,4 @@
const std = @import("std"); const std = @import("std");
// const rl = @import("libs/raylib-zig/build.zig");
const raylib = @import("libs/raylib/build.zig"); const raylib = @import("libs/raylib/build.zig");
pub fn build(b: *std.Build) !void { 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 // TODO: Figure out how to build project for WASM. Tried to do it but standard memory allocators
// didn't work. // didn't work.
//web exports are completely separate const exe = b.addExecutable(.{
// if (target.getOsTag() == .emscripten) { .name = "chip8-zig",
// const exe_lib = rl.compileForEmscripten(b, "chip8-zig", "src/main.zig", target, optimize); .root_source_file = .{ .path = "src/main.zig" },
// exe_lib.addModule("raylib", raylib); .optimize = optimize,
// exe_lib.addModule("raylib-math", raylib_math); .target = target
// });
// 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 });
// Provide filenames of all files in 'src/ROMs' to program as options // 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); 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_step = b.step("models", "Export .blend files");
var build_models = b.addSystemCommand(&[_][]const u8{ "blender" }); var build_models = b.addSystemCommand(&[_][]const u8{ "blender" });

1
libs/raylib-zig

@ -1 +0,0 @@
Subproject commit a106b9968fab5eae97a8f9fc85e0379358642c8d