-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from zPSP-Dev/latest-update
Update to Zig 0.12.0 Nightly
- Loading branch information
Showing
59 changed files
with
1,265 additions
and
1,178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,115 +1,138 @@ | ||
| const Builder = @import("std").build.Builder; | ||
| const z = @import("std").zig; | ||
| const std = @import("std"); | ||
| const builtin = std.builtin; | ||
|
|
||
| pub const PSPBuildInfo = struct{ | ||
| pub const PSPBuildInfo = struct { | ||
| //SDK Path | ||
| path_to_sdk: []const u8, | ||
| src_file: []const u8, | ||
| //Title | ||
| title: []const u8, | ||
| //Optional customizations | ||
| icon0: []const u8 = "NULL", | ||
| icon1: []const u8 = "NULL", | ||
| pic0: []const u8 = "NULL", | ||
| pic1: []const u8 = "NULL", | ||
| snd0: []const u8 = "NULL", | ||
| icon0: []const u8 = &[0]u8{}, | ||
| icon1: []const u8 = &[0]u8{}, | ||
| pic0: []const u8 = &[0]u8{}, | ||
| pic1: []const u8 = &[0]u8{}, | ||
| snd0: []const u8 = &[0]u8{}, | ||
| }; | ||
|
|
||
| const append : []const u8 = switch(builtin.os.tag){ | ||
| const append: []const u8 = switch (builtin.os.tag) { | ||
| .windows => ".exe", | ||
| else => "", | ||
| }; | ||
|
|
||
| pub fn build_psp(b: *Builder, comptime build_info: PSPBuildInfo) !void { | ||
| var feature_set : std.Target.Cpu.Feature.Set = std.Target.Cpu.Feature.Set.empty; | ||
| feature_set.addFeature(@enumToInt(std.Target.mips.Feature.single_float)); | ||
| pub fn build_psp(b: *std.Build, comptime build_info: PSPBuildInfo) !void { | ||
| var feature_set: std.Target.Cpu.Feature.Set = std.Target.Cpu.Feature.Set.empty; | ||
| feature_set.addFeature(@intFromEnum(std.Target.mips.Feature.single_float)); | ||
|
|
||
| //PSP-Specific Build Options | ||
| const target = z.CrossTarget{ | ||
| // const target = z.CrossTarget{}; | ||
| // const target = b.standardTargetOptions(.{ .whitelist = &.{.{ | ||
| // }} }); | ||
| const target = b.resolveTargetQuery(.{ | ||
| .cpu_arch = .mipsel, | ||
| .os_tag = .freestanding, | ||
| .cpu_model = .{ .explicit = &std.Target.mips.cpu.mips2 }, | ||
| .cpu_features_add = feature_set | ||
| }; | ||
| .cpu_features_add = feature_set, | ||
| }); | ||
|
|
||
| //All of the release modes work | ||
| //Debug Mode can cause issues with trap instructions - use ReleaseSafe for "Debug" builds | ||
| const mode = builtin.Mode.ReleaseSmall; | ||
| const optimize = builtin.Mode.ReleaseSmall; | ||
|
|
||
| //Build from your main file! | ||
| const exe = b.addExecutable("main", build_info.src_file); | ||
| const exe = b.addExecutable(.{ | ||
| .name = "main", | ||
| .root_source_file = b.path(build_info.src_file), | ||
| .target = target, | ||
| .optimize = optimize, | ||
| .strip = false, // disable as cannot be used with "link_emit_relocs = true" | ||
| // .single_threaded = true, | ||
| }); | ||
|
|
||
| exe.setLinkerScriptPath(b.path(build_info.path_to_sdk ++ "tools/linkfile.ld")); | ||
|
|
||
| //Set mode & target | ||
| exe.setTarget(target); | ||
| exe.setBuildMode(mode); | ||
| exe.setLinkerScriptPath(build_info.path_to_sdk ++ "tools/linkfile.ld"); | ||
| exe.link_eh_frame_hdr = true; | ||
| exe.link_emit_relocs = true; | ||
| exe.strip = true; | ||
| exe.single_threaded = true; | ||
| exe.install(); | ||
| exe.setOutputDir("zig-cache/"); | ||
| // exe.install(); | ||
| // b.installArtifact(exe); | ||
|
|
||
| // exe.setOutputDir("zig-cache/"); | ||
|
|
||
| //Post-build actions | ||
| const hostTarget = b.standardTargetOptions(.{}); | ||
| const prx = b.addExecutable("prxgen", build_info.path_to_sdk ++ "tools/prxgen/stub.zig"); | ||
| prx.setTarget(hostTarget); | ||
| prx.addCSourceFile(build_info.path_to_sdk ++ "tools/prxgen/psp-prxgen.c", &[_][]const u8{"-std=c99", "-Wno-address-of-packed-member", "-D_CRT_SECURE_NO_WARNINGS"}); | ||
| prx.linkLibC(); | ||
| prx.setBuildMode(builtin.Mode.ReleaseFast); | ||
| prx.setOutputDir(build_info.path_to_sdk ++ "tools/bin"); | ||
| prx.install(); | ||
| prx.step.dependOn(&exe.step); | ||
|
|
||
| const generate_prx = b.addSystemCommand(&[_][]const u8{ | ||
| build_info.path_to_sdk ++ "tools/bin/prxgen" ++ append, | ||
| "zig-cache/main", | ||
| "app.prx" | ||
| const hostOptimize = b.standardOptimizeOption(.{}); | ||
| const prx = b.addExecutable(.{ | ||
| .name = "prxgen", | ||
| .root_source_file = b.path(build_info.path_to_sdk ++ "tools/prxgen/stub.zig"), | ||
| .link_libc = true, | ||
| .target = hostTarget, | ||
| .optimize = .ReleaseFast, | ||
| }); | ||
| generate_prx.step.dependOn(&prx.step); | ||
| prx.addCSourceFile(.{ | ||
| .file = b.path(build_info.path_to_sdk ++ "tools/prxgen/psp-prxgen.c"), | ||
| .flags = &[_][]const u8{ | ||
| "-std=c99", | ||
| "-Wno-address-of-packed-member", | ||
| "-D_CRT_SECURE_NO_WARNINGS", | ||
| }, | ||
| }); | ||
| b.installArtifact(prx); | ||
| // prx.setOutputDir(build_info.path_to_sdk ++ "tools/bin"); | ||
| // prx.install(); | ||
| // prx.step.dependOn(&exe.step); | ||
|
|
||
| //Build SFO | ||
| const sfo = b.addExecutable("sfotool", build_info.path_to_sdk ++ "tools/sfo/src/main.zig"); | ||
| sfo.setTarget(hostTarget); | ||
| sfo.setBuildMode(builtin.Mode.ReleaseFast); | ||
| sfo.setOutputDir(build_info.path_to_sdk ++ "tools/bin"); | ||
| sfo.install(); | ||
| sfo.step.dependOn(&generate_prx.step); | ||
| // const generate_prx = b.addSystemCommand(&[_][]const u8{ build_info.path_to_sdk ++ "tools/bin/prxgen" ++ append, "zig-cache/main", "app.prx" }); | ||
| // generate_prx.step.dependOn(&prx.step); | ||
|
|
||
| //Make the SFO file | ||
| const mk_sfo = b.addSystemCommand(&[_][]const u8{ | ||
| build_info.path_to_sdk ++ "tools/bin/sfotool" ++ append, "write", | ||
| build_info.title, | ||
| "PARAM.SFO" | ||
| const generate_prx_step = b.addRunArtifact(prx); | ||
| generate_prx_step.addArtifactArg(exe); | ||
| const prx_file = generate_prx_step.addOutputFileArg("app.prx"); | ||
|
|
||
| //Build SFO | ||
| const sfo = b.addExecutable(.{ | ||
| .name = "sfotool", | ||
| .root_source_file = b.path(build_info.path_to_sdk ++ "tools/sfo/src/main.zig"), | ||
| .target = hostTarget, | ||
| .optimize = hostOptimize, | ||
| }); | ||
| mk_sfo.step.dependOn(&sfo.step); | ||
| // sfo.setOutputDir(build_info.path_to_sdk ++ "tools/bin"); | ||
| b.installArtifact(sfo); | ||
|
|
||
| //Make the SFO file | ||
| // const mk_sfo = b.addSystemCommand(&[_][]const u8{ build_info.path_to_sdk ++ "tools/bin/sfotool" ++ append, "write", build_info.title, "PARAM.SFO" }); | ||
| const mk_sfo = b.addRunArtifact(sfo); | ||
| mk_sfo.addArg("write"); | ||
| mk_sfo.addArg(build_info.title); | ||
| const sfo_file = mk_sfo.addOutputFileArg("PARAM.SFO"); | ||
| // mk_sfo.step.dependOn(&sfo.step); | ||
|
|
||
| //Build PBP | ||
| const PBP = b.addExecutable("pbptool", build_info.path_to_sdk ++ "tools/pbp/src/main.zig"); | ||
| PBP.setTarget(hostTarget); | ||
| PBP.setBuildMode(builtin.Mode.ReleaseFast); | ||
| PBP.setOutputDir(build_info.path_to_sdk ++ "tools/bin"); | ||
| PBP.install(); | ||
| PBP.step.dependOn(&mk_sfo.step); | ||
|
|
||
| //Pack the PBP executable | ||
| const pack_pbp = b.addSystemCommand(&[_][]const u8{ | ||
| build_info.path_to_sdk ++ "tools/bin/pbptool" ++ append, "pack", | ||
| "EBOOT.PBP", | ||
| "PARAM.SFO", | ||
| build_info.icon0, | ||
| build_info.icon1, | ||
| build_info.pic0, | ||
| build_info.pic1, | ||
| build_info.snd0, | ||
| "app.prx", | ||
| "NULL" //DATA.PSAR not necessary. | ||
| const PBP = b.addExecutable(.{ | ||
| .name = "pbptool", | ||
| .root_source_file = b.path(build_info.path_to_sdk ++ "tools/pbp/src/main.zig"), | ||
| .target = hostTarget, | ||
| .optimize = hostOptimize, | ||
| }); | ||
| pack_pbp.step.dependOn(&PBP.step); | ||
| // PBP.setOutputDir(build_info.path_to_sdk ++ "tools/bin"); | ||
| //Pack the PBP executable | ||
| const pack_pbp = b.addRunArtifact(PBP); | ||
| pack_pbp.addArg("pack"); | ||
| const eboot_file = pack_pbp.addOutputFileArg("EBOOT.PBP"); | ||
| pack_pbp.addFileArg(sfo_file); | ||
| if (build_info.icon0.len > 0) pack_pbp.addFileArg(b.path(build_info.icon0)) else pack_pbp.addArg("NULL"); | ||
| if (build_info.icon1.len > 0) pack_pbp.addFileArg(b.path(build_info.icon1)) else pack_pbp.addArg("NULL"); | ||
| if (build_info.pic0.len > 0) pack_pbp.addFileArg(b.path(build_info.pic0)) else pack_pbp.addArg("NULL"); | ||
| if (build_info.pic1.len > 0) pack_pbp.addFileArg(b.path(build_info.pic1)) else pack_pbp.addArg("NULL"); | ||
| if (build_info.snd0.len > 0) pack_pbp.addFileArg(b.path(build_info.snd0)) else pack_pbp.addArg("NULL"); | ||
| pack_pbp.addFileArg(prx_file); | ||
| pack_pbp.addArg("NULL"); //DATA.PSAR not necessary. | ||
|
|
||
| const install_file = b.addInstallBinFile(eboot_file, "EBOOT.PBP"); | ||
| b.getInstallStep().dependOn(&install_file.step); | ||
|
|
||
| //Enable the build | ||
| b.default_step.dependOn(&pack_pbp.step); | ||
| // const install = b.getInstallStep(); | ||
| // install.dependOn(&pack_pbp.step); | ||
| //b.default_step.dependOn(&pack_pbp.step); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.