From 7789d91ab53793ffe333d6af14b1e42cd8b90a2c Mon Sep 17 00:00:00 2001
From: Jarrod Meyer <meyerja.2013@gmail.com>
Date: Mon, 6 May 2024 06:15:09 -0400
Subject: [PATCH 1/3] Revert "workaround for #9"

This reverts commit 8947e9db64b18c1d2a7ba9440d89b5a339e0c6a0.
---
 .gitignore |  3 +--
 build.zig  | 18 +++---------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 419dae86..10764bbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /zig-cache
-/zig-out
-/generated
\ No newline at end of file
+/zig-out
\ No newline at end of file
diff --git a/build.zig b/build.zig
index fed8e1f1..ef4600fd 100644
--- a/build.zig
+++ b/build.zig
@@ -29,28 +29,16 @@ pub fn build(b: *std.Build) void {
     exe.addIncludePath(b.path("src/studio"));
     exe.addCSourceFiles(.{ .files = open3dmm_sources, .flags = open3dmm_flags });
 
-    const kauai_dep = @"open3dmm-core_dep".builder.dependency("kauai", .{
-        .target = target,
-        .optimize = optimize,
-    });
-
-    const copy_files = b.addWriteFiles();
-    copy_files.addCopyFileToSource(@"open3dmm-core_dep".path("inc/socdef.h"), "generated/core/socdef.h");
-    copy_files.addCopyFileToSource(kauai_dep.path("kauai/src/frameres.h"), "generated/frameres.h");
-    copy_files.addCopyFileToSource(kauai_dep.path("kauai/src/framedef.h"), "generated/framedef.h");
-    copy_files.addCopyFileToSource(kauai_dep.path("kauai/src/frame.rc"), "generated/frame.rc");
-    exe.step.dependOn(&copy_files.step);
-    
     exe.addWin32ResourceFile(.{
         .file = b.path("src/studio/utest.rc"),
         .flags = &.{
             "/y",
             "/i",
-            "inc",
+            b.pathFromRoot("inc"),
             "/i",
-            "generated",
+            b.getInstallPath(.header, ""),
             "/i",
-            "src",
+            b.pathFromRoot("src"),
         },
     });
 

From e23aa0c469aa342c5f1b5b56db6746fb60d56920 Mon Sep 17 00:00:00 2001
From: Jarrod Meyer <meyerja.2013@gmail.com>
Date: Mon, 6 May 2024 06:20:07 -0400
Subject: [PATCH 2/3] kauai: include the .rc file extension

---
 build.zig.zon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.zig.zon b/build.zig.zon
index 6ed9b08a..bb8a16a5 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -3,8 +3,8 @@
     .version = "0.0.0",
     .dependencies = .{
         .@"open3dmm-core" = .{
-            .url = "https://github.com/jayrod246/open3DMM-core/archive/c03c9c7476c80b0e61b102cdc17f103a5052cd33.tar.gz",
-            .hash = "1220e890a6306c00a3c36694f870318ce8e4cdcfd81d8db3d5f3b312b25d570dd021",
+            .url = "https://github.com/jayrod246/open3DMM-core/archive/1d1b90bd3f592f3641d53486ad5085e750668f94.tar.gz",
+            .hash = "12208261a8eb295f3bf2f9e9420bcfeca8bd4c773a1bdc4d784858efa74ee192aebe",
         },
     },
     .paths = .{

From a775cfe82cef0c7c31099f6839985c631534fc4d Mon Sep 17 00:00:00 2001
From: Jarrod Meyer <meyerja.2013@gmail.com>
Date: Mon, 6 May 2024 06:23:11 -0400
Subject: [PATCH 3/3] build.zig: fix resinator includes

---
 build.zig | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.zig b/build.zig
index ef4600fd..9517aee7 100644
--- a/build.zig
+++ b/build.zig
@@ -31,14 +31,13 @@ pub fn build(b: *std.Build) void {
 
     exe.addWin32ResourceFile(.{
         .file = b.path("src/studio/utest.rc"),
+        .include_paths = &.{exe.getEmittedIncludeTree()},
         .flags = &.{
             "/y",
             "/i",
-            b.pathFromRoot("inc"),
+            "inc",
             "/i",
-            b.getInstallPath(.header, ""),
-            "/i",
-            b.pathFromRoot("src"),
+            "src",
         },
     });