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

Author: HaxSam

build.zig

@@ -188,20 +188,7 @@ pub const StepOptions = struct {
 pub fn emccStep(
     b: *std.Build,
     wasm: *std.Build.Step.Compile,
-<<<<<<< HEAD
-    options: 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,
-    },
-=======
     options: StepOptions,
->>>>>>> c0b8b70 (build.zig: pulled out the options to its own structs)
 ) *std.Build.Step {
     var emcc = b.addSystemCommand(&.{emccPath(b)});