Make Windows build work with GNU toolchain

gradle · Aug 14, 2024 · e8caba9 · e8caba9
1 parent 4ea7f6c
commit e8caba9
Showing 1 changed file with 4 additions and 29 deletions.
diff --git a/file-events/build.zig b/file-events/build.zig
@@ -18,8 +18,7 @@ pub fn build(b: *std.Build) void {
     lib.addSystemIncludePath(.{ .cwd_relative = java_include_path });
     lib.addSystemIncludePath(.{ .cwd_relative = java_darwin_include_path });
 
-    // Set common C++ compiler flags
-    const cpp_args = [_][]const u8{
+    const cpp_args = &[_][]const u8{
         "--std=c++17",
         "-g",
         "-pedantic",
@@ -30,6 +29,8 @@ pub fn build(b: *std.Build) void {
         "-Wno-deprecated-declarations",
         "-Wno-format-nonliteral",
         "-Wno-unguarded-availability-new",
+        // TODO Only pass this for Windows
+        "-DNTDDI_VERSION=NTDDI_WIN10_RS3",
     };
 
     // Add source files
@@ -44,39 +45,13 @@ pub fn build(b: *std.Build) void {
             "src/file-events/cpp/services.cpp",
             "src/file-events/cpp/win_fsnotifier.cpp",
         },
-        .flags = &cpp_args,
+        .flags = cpp_args,
     });
 
     // Link against libc and libstdc++
     lib.linkLibC();
     lib.linkLibCpp();
 
-    // // Platform-specific configurations
-    // if (target.os.tag == .macos or target.os.tag == .linux) {
-    //     lib.c_flags.append("-pthread");
-
-    //     // Set linker flags
-    //     lib.linker_flags.append("-pthread");
-    // } else if (target.os.tag == .windows) {
-    //     lib.c_flags = &[_][]const u8{
-    //         "/DEBUG",
-    //         "/permissive-",
-    //         "/EShc",
-    //         "/Zi",
-    //         "/FS",
-    //         "/Zc:inline",
-    //         "/Zc:throwingNew",
-    //         "/W3",
-    //         "/WX",
-    //         "/D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING",
-    //     };
-
-    //     // Set linker flags
-    //     lib.linker_flags = &[_][]const u8{
-    //         "/DEBUG:FULL",
-    //     };
-    // }
-
     // lib.verbose_cc = true;
     // lib.verbose_link = true;