diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | build.zig | 31 | ||||
| m--------- | depends/mgl | 0 | ||||
| m--------- | depends/mgl-zig | 0 |
4 files changed, 8 insertions, 29 deletions
diff --git a/.gitmodules b/.gitmodules index b6b69cf..d9cbb07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "depends/mgl"] - path = depends/mgl - url = https://repo.dec05eba.com/mgl +[submodule "depends/mgl-zig"] + path = depends/mgl-zig + url = https://repo.dec05eba.com/mgl-zig @@ -11,36 +11,15 @@ pub fn build(b: *std.Build) void { .optimize = optimize, }); - exe.addCSourceFiles(&[_][]const u8{ - "depends/mgl/src/graphics/texture.c", - "depends/mgl/src/graphics/sprite.c", - "depends/mgl/src/graphics/image.c", - "depends/mgl/src/graphics/font_char_map.c", - "depends/mgl/src/graphics/font.c", - "depends/mgl/src/graphics/vertex.c", - "depends/mgl/src/graphics/primitive_type.c", - "depends/mgl/src/graphics/vertex_buffer.c", - "depends/mgl/src/graphics/text.c", - "depends/mgl/src/graphics/shader.c", - "depends/mgl/src/graphics/rectangle.c", - "depends/mgl/src/system/fileutils.c", - "depends/mgl/src/system/utf8.c", - "depends/mgl/src/system/clock.c", - "depends/mgl/src/mgl.c", - "depends/mgl/src/window/window.c", - "depends/mgl/src/gl.c", - }, &[_][]const u8{ - "-Wall", - "-Wextra", + const mgl_dep = b.anonymousDependency("depends/mgl-zig", @import("depends/mgl-zig/build.zig"), .{ + .target = target, + .optimize = optimize, }); - exe.addIncludePath(.{ .path = "depends/mgl/include" }); - exe.linkSystemLibrary("x11"); - exe.linkSystemLibrary("xrender"); - exe.linkLibC(); + exe.linkLibrary(mgl_dep.artifact("mgl-zig")); exe.strip = optimize != std.builtin.OptimizeMode.Debug; - exe.single_threaded = true; exe.want_lto = optimize != std.builtin.OptimizeMode.Debug; + exe.single_threaded = true; b.installArtifact(exe); diff --git a/depends/mgl b/depends/mgl deleted file mode 160000 -Subproject 15cb00dfffd777e97abf8732f84a3c3c3bd659e diff --git a/depends/mgl-zig b/depends/mgl-zig new file mode 160000 +Subproject 653de46953ba5d24abd83e532dcff11d9ae6404 |