zigcc: betterC on Darwin

.gitignore

@@ -25,4 +25,7 @@ docs/
 *.lst
 
 # Zig build
-zig-*/
+zig-*/
+
+#VScode
+.vscode/

README.md

@@ -25,9 +25,23 @@ zig build debugtext_print -Doptimize=ReleaseFast # run, but no anims (fixme)
 zig build sgl_context -Doptimize=ReleaseFast # run, but no anims (fixme)
 zig build cube -Doptimize=ReleaseFast # (fixme)
 
-# custom options:
-# -DZigCC (use zig cc as compiler and linker),
-# -DBetterC (disable D runtime on ldc2)
+zig build --help
+# Project-Specific Options:
+#   -Dgl=[bool]                  Force GL backend
+#   -Dwayland=[bool]             Compile with wayland-support (default: false)
+#   -Dx11=[bool]                 Compile with x11-support (default: true)
+#   -Degl=[bool]                 Use EGL instead of GLX if possible (default: false)
+#   -Dtarget=[string]            The CPU architecture, OS, and ABI to build for
+#   -Dcpu=[string]               Target CPU features to add or subtract
+#   -Doptimize=[enum]            Prioritize performance, safety, or binary size (-O flag)
+#                                  Supported Values:
+#                                    Debug
+#                                    ReleaseSafe
+#                                    ReleaseFast
+#                                    ReleaseSmall
+#   -DShared=[bool]              Build sokol dynamic library [default: static]
+#   -DBetterC=[bool]             Omit generating some runtime information and helper functions. [default: false]
+#   -DZigCC=[bool]               Use zig cc as compiler and linker. [default: false]
 ```
 
 ## Shaders

build.zig

@@ -42,13 +42,6 @@ pub fn buildSokol(b: *Builder, target: CrossTarget, optimize: OptimizeMode, conf
         .optimize = optimize,
     });
     lib.disable_sanitize_c = true;
-    switch (optimize) {
-        // zig have custom compiler-rt and another toolchains not include it (fix: unknown ref zig_stack_protector)
-        .Debug, .ReleaseSafe => lib.bundle_compiler_rt = true,
-        else => lib.strip = true,
-    }
-    if (!sharedlib)
-        lib.pie = true;
     lib.linkLibC();
     const sokol_path = prefix_path ++ "src/sokol/c/";
     const csources = [_][]const u8{
@@ -248,8 +241,8 @@ pub fn build(b: *Builder) !void {
                 "--vgc", // list all gc alloc
                 "--preview=dip1000",
             },
-            // fixme: https://github.com/kassane/sokol-d/issues/1
-            .zig_cc = if (target.isDarwin()) false else enable_zigcc,
+            // fixme: https://github.com/kassane/sokol-d/issues/1 - betterC works on darwin
+            .zig_cc = if (target.isDarwin() and !enable_betterC) false else enable_zigcc,
         });
         ldc.setName("ldc2");
         ldc.step.dependOn(b.getInstallStep());
@@ -304,7 +297,7 @@ fn buildShaders(b: *Builder) void {
 }
 
 // Use LDC2 (https://github.com/ldc-developers/ldc) to compile the D examples
-fn buildLDC(b: *Builder, lib: *Builder.CompileStep, config: ldcConfig) !*Builder.RunStep {
+fn buildLDC(b: *Builder, lib: *CompileStep, config: ldcConfig) !*Builder.RunStep {
     const ldc = try b.findProgram(&.{"ldc2"}, &.{});
 
     var cmds = std.ArrayList([]const u8).init(b.allocator);
@@ -500,8 +493,8 @@ fn buildZigCC(b: *Builder) void {
 }
 
 const ldcConfig = struct {
-    kind: Builder.CompileStep.Kind = .exe,
-    linkage: Builder.CompileStep.Linkage = .static,
+    kind: CompileStep.Kind = .exe,
+    linkage: CompileStep.Linkage = .static,
     betterC: bool = false,
     sources: []const []const u8 = std.mem.zeroes([]const []const u8),
     dflags: []const []const u8 = std.mem.zeroes([]const []const u8),

src/examples/sgl_context.d

@@ -155,7 +155,7 @@ void frame()
     sg.commit();
 }
 
-static void cleanup()
+void cleanup()
 {
     sgl.shutdown();
     sg.shutdown();

tools/zigcc.zig

@@ -27,7 +27,7 @@ pub fn main() !void {
             try cmds.append("-target");
             try cmds.append("native-native-msvc"); // msvc only
         },
-        .macos, .ios => {},
+        .ios, .macos, .watchos, .tvos => {},
         else => {
             try cmds.append("-target");
             try cmds.append("native-native");