Skip to content

Commit

Permalink
changed to b.path() function
Browse files Browse the repository at this point in the history
  • Loading branch information
dinau committed Jun 16, 2024
1 parent 381eb54 commit 3030ea9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
22 changes: 11 additions & 11 deletions examples/zig_glfw_opengl3/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ pub fn build(b: *std.Build) void {
//---------------
// Include paths
//---------------
exe.addIncludePath(.{ .path = b.pathJoin(&.{glfw_path,"include"})});
exe.addIncludePath(.{ .path = "src" });
exe.addIncludePath(.{ .path = "../utils" });
exe.addIncludePath(.{ .path = "../utils/fonticon" });
exe.addIncludePath(.{ .path = "../libs/cimgui" });
exe.addIncludePath(.{ .path = "../../libs/imgui" });
exe.addIncludePath(.{ .path = "../../libs/stb" });
exe.addIncludePath(.{ .path = "../../libs/imgui/backends" });
exe.addIncludePath(b.path(b.pathJoin(&.{glfw_path,"include"})));
exe.addIncludePath(b.path("src"));
exe.addIncludePath(b.path("../utils"));
exe.addIncludePath(b.path("../utils/fonticon"));
exe.addIncludePath(b.path("../libs/cimgui"));
exe.addIncludePath(b.path("../../libs/imgui"));
exe.addIncludePath(b.path("../../libs/stb"));
exe.addIncludePath(b.path("../../libs/imgui/backends"));
//--------------------------------
// Define macro for C/C++ sources
//--------------------------------
Expand Down Expand Up @@ -105,12 +105,12 @@ pub fn build(b: *std.Build) void {
exe.linkSystemLibrary("user32");
exe.linkSystemLibrary("shell32");
// GLFW
//exe.addLibraryPath(.{.path = b.pathJoin(&.{glfw_path, "lib-mingw-64"})});
//exe.addLibraryPath(b.path(b.pathJoin(&.{glfw_path, "lib-mingw-64"})));
//exe.linkSystemLibrary("glfw3"); // For static link
// Static link
exe.addObjectFile(.{.path = b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3.a"})});
exe.addObjectFile(b.path(b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3.a"})));
// Dynamic link
//exe.addObjectFile(.{.path = b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3dll.a"})});
//exe.addObjectFile(b.path(b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3dll.a"})));
//exe.linkSystemLibrary("glfw3dll"); // For dynamic link
// System
exe.linkLibC();
Expand Down
22 changes: 11 additions & 11 deletions examples/zig_glfw_opengl3_image_load/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ pub fn build(b: *std.Build) void {
//---------------
// Include paths
//---------------
exe.addIncludePath(.{ .path = b.pathJoin(&.{glfw_path,"include"})});
exe.addIncludePath(.{ .path = "src" });
exe.addIncludePath(.{ .path = "../utils" });
exe.addIncludePath(.{ .path = "../utils/fonticon" });
exe.addIncludePath(.{ .path = "../libs/cimgui" });
exe.addIncludePath(.{ .path = "../../libs/imgui" });
exe.addIncludePath(.{ .path = "../../libs/stb" });
exe.addIncludePath(.{ .path = "../../libs/imgui/backends" });
exe.addIncludePath(b.path(b.pathJoin(&.{glfw_path,"include"})));
exe.addIncludePath(b.path("src"));
exe.addIncludePath(b.path("../utils"));
exe.addIncludePath(b.path("../utils/fonticon"));
exe.addIncludePath(b.path("../libs/cimgui"));
exe.addIncludePath(b.path("../../libs/imgui"));
exe.addIncludePath(b.path("../../libs/stb"));
exe.addIncludePath(b.path("../../libs/imgui/backends"));
//--------------------------------
// Define macro for C/C++ sources
//--------------------------------
Expand Down Expand Up @@ -105,12 +105,12 @@ pub fn build(b: *std.Build) void {
exe.linkSystemLibrary("user32");
exe.linkSystemLibrary("shell32");
// GLFW
//exe.addLibraryPath(.{.path = b.pathJoin(&.{glfw_path, "lib-mingw-64"})});
//exe.addLibraryPath(b.path(b.pathJoin(&.{glfw_path, "lib-mingw-64"})));
//exe.linkSystemLibrary("glfw3"); // For static link
// Static link
exe.addObjectFile(.{.path = b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3.a"})});
exe.addObjectFile(b.path(b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3.a"})));
// Dynamic link
//exe.addObjectFile(.{.path = b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3dll.a"})});
//exe.addObjectFile(b.path(b.pathJoin(&.{glfw_path, "lib-mingw-w64","libglfw3dll.a"})));
//exe.linkSystemLibrary("glfw3dll"); // For dynamic link
// System
exe.linkLibC();
Expand Down

0 comments on commit 3030ea9

Please sign in to comment.