From ef93bbe0849fef163ae843947f3586ce3be3e90d Mon Sep 17 00:00:00 2001
From: paoda <rekai@musuka.dev>
Date: Wed, 6 Mar 2024 17:59:08 -0600
Subject: [PATCH] ci: resolve ci build errors for the last time i promise

---
 .github/workflows/main.yml | 6 ++----
 .gitmodules                | 6 +++---
 build.zig                  | 1 -
 lib/SDL.zig                | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3a31f28..b6fc745 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,14 +41,12 @@ jobs:
             brew install sdl2
       - name: build 
         run: zig build -Doptimize=ReleaseSafe -Dcpu=baseline
-      - name: prepare-executable
-        run: |
-            mv zig-out/lib/* zig-out/bin
       - name: upload
         uses: actions/upload-artifact@v3
         with:
           name: zba-${{matrix.os}}
-          path: zig-out/bin
+          path: zig-out
+
   lint:
     runs-on: ubuntu-latest
     steps: 
diff --git a/.gitmodules b/.gitmodules
index fb0fe3f..411cc96 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "lib/SDL.zig"]
-	path = lib/SDL.zig
-	url = https://github.com/paoda/SDL.zig
 [submodule "lib/zgui"]
 	path = lib/zgui
 	url = https://git.musuka.dev/paoda/zgui
+[submodule "lib/SDL.zig"]
+	path = lib/SDL.zig
+	url = https://github.com/paoda/SDL.zig
diff --git a/build.zig b/build.zig
index 256ceb4..ec69dc3 100644
--- a/build.zig
+++ b/build.zig
@@ -43,7 +43,6 @@ pub fn build(b: *std.Build) void {
     exe.root_module.addImport("sdl2", sdk.getNativeModule());
 
     // https://git.musuka.dev/paoda/zgui
-    // .shared option should stay in sync with SDL.zig call above where true == .dynamic, and false == .static
     const zgui_pkg = zgui.package(b, target, optimize, .{ .options = .{ .backend = .sdl2_opengl3 } });
     zgui_pkg.link(exe);
     sdk.link(zgui_pkg.zgui_c_cpp, .dynamic);
diff --git a/lib/SDL.zig b/lib/SDL.zig
index 6d42434..cd90212 160000
--- a/lib/SDL.zig
+++ b/lib/SDL.zig
@@ -1 +1 @@
-Subproject commit 6d42434c4d92efb1199d58f821edb7f701812f7e
+Subproject commit cd902129b7ab571693892c72bbf4e2fb58658730