build.zig: pulled out the options to its own structs

Author: HaxSam

build.zig

@@ -105,10 +105,12 @@ pub fn activateEmsdkStep(b: *std.Build) *std.Build.Step {
 
 pub const EmccFlags = std.StringHashMap(void);
 
-pub fn emccDefaultFlags(allocator: std.mem.Allocator, options: struct {
+pub const EmccDefaultFlagsOverrides = struct {
     optimize: std.builtin.OptimizeMode,
     fsanitize: bool,
-}) EmccFlags {
+};
+
+pub fn emccDefaultFlags(allocator: std.mem.Allocator, options: EmccDefaultFlagsOverrides) EmccFlags {
     var args = EmccFlags.init(allocator);
     switch (options.optimize) {
         .Debug => {
@@ -136,22 +138,23 @@ pub fn emccDefaultFlags(allocator: std.mem.Allocator, options: struct {
 
 pub const EmccSettings = std.StringHashMap([]const u8);
 
-pub fn emccDefaultSettings(
-    allocator: std.mem.Allocator,
-    options: struct {
-        optimize: std.builtin.OptimizeMode,
-        emsdk_allocator: enum {
-            none,
-            dlmalloc,
-            emmalloc,
-            @"emmalloc-debug",
-            @"emmalloc-memvalidate",
-            @"emmalloc-verbose",
-            mimalloc,
-        } = .emmalloc,
-        shell_file: ?[]const u8 = null,
-    },
-) EmccSettings {
+pub const EmsdkAllocator = enum {
+    none,
+    dlmalloc,
+    emmalloc,
+    @"emmalloc-debug",
+    @"emmalloc-memvalidate",
+    @"emmalloc-verbose",
+    mimalloc,
+};
+
+pub const EmccDefaultSettingsOverrides = struct {
+    optimize: std.builtin.OptimizeMode,
+    emsdk_allocator: EmsdkAllocator = .emmalloc,
+    shell_file: ?[]const u8 = null,
+};
+
+pub fn emccDefaultSettings(allocator: std.mem.Allocator, options: EmccDefaultSettingsOverrides) EmccSettings {
     var settings = EmccSettings.init(allocator);
     switch (options.optimize) {
         .Debug, .ReleaseSafe => {
@@ -171,9 +174,21 @@ pub const EmccFilePath = struct {
     virtual_path: ?[]const u8 = null,
 };
 
+pub const StepOptions = struct {
+    optimize: std.builtin.OptimizeMode,
+    flags: EmccFlags,
+    settings: EmccSettings,
+    use_preload_plugins: bool = false,
+    embed_paths: ?[]const EmccFilePath = null,
+    preload_paths: ?[]const EmccFilePath = null,
+    shell_file_path: ?std.Build.LazyPath = null,
+    install_dir: std.Build.InstallDir,
+};
+
 pub fn emccStep(
     b: *std.Build,
     wasm: *std.Build.Step.Compile,
+<<<<<<< HEAD
     options: struct {
         optimize: std.builtin.OptimizeMode,
         flags: EmccFlags,
@@ -184,6 +199,9 @@ pub fn emccStep(
         shell_file_path: ?std.Build.LazyPath = null,
         install_dir: std.Build.InstallDir,
     },
+=======
+    options: StepOptions,
+>>>>>>> c0b8b70 (build.zig: pulled out the options to its own structs)
 ) *std.Build.Step {
     var emcc = b.addSystemCommand(&.{emccPath(b)});