From 415f3589b699fe25ea2b980a4a208e9d2c10e1bf Mon Sep 17 00:00:00 2001
From: Warwick <warwick.l.e.new@gmail.com>
Date: Thu, 12 Jun 2025 12:45:08 +0100
Subject: [PATCH] Almost got all dependancies in through meson (which I'm using
 because cglm isn't cmake based)

Still gotta workout how to get dawn in
---
 .gitignore                     | 10 +++++-----
 .gitmodules                    | 11 +----------
 deps_src/SDL3                  |  1 -
 deps_src/SDL3_image            |  1 -
 deps_src/cglm                  |  1 -
 meson.build                    | 10 ++++++++++
 subprojects/cglm.wrap          | 10 ++++++++++
 {deps_src => subprojects}/dawn |  0
 subprojects/sdl3.wrap          | 13 +++++++++++++
 subprojects/sdl3_image.wrap    | 13 +++++++++++++
 10 files changed, 52 insertions(+), 18 deletions(-)
 delete mode 160000 deps_src/SDL3
 delete mode 160000 deps_src/SDL3_image
 delete mode 160000 deps_src/cglm
 create mode 100644 meson.build
 create mode 100644 subprojects/cglm.wrap
 rename {deps_src => subprojects}/dawn (100%)
 create mode 100644 subprojects/sdl3.wrap
 create mode 100644 subprojects/sdl3_image.wrap

diff --git a/.gitignore b/.gitignore
index 43255e9..7954eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-.cache/
-CMakeCache.txt
-CMakeFiles/
-Makefile
-cmake_install.cmake
 compile_commands.json
 webgpu
+
+## Meson
+subprojects/
+!subprojects/*.wrap
+!subprojects/dawn
diff --git a/.gitmodules b/.gitmodules
index 218b7f8..0d174e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "cglm"]
-	path = deps_src/cglm
-	url = git@github.com:recp/cglm.git
 [submodule "dawn"]
-	path = deps_src/dawn
+	path = subprojects/dawn
 	url = git@github.com:google/dawn.git
-[submodule "deps_src/SDL3"]
-	path = deps_src/SDL3
-	url = https://github.com/libsdl-org/SDL.git
-[submodule "deps_src/SDL3_image"]
-	path = deps_src/SDL3_image
-	url = git@github.com:libsdl-org/SDL_image.git
diff --git a/deps_src/SDL3 b/deps_src/SDL3
deleted file mode 160000
index c9a6709..0000000
--- a/deps_src/SDL3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c9a6709bd21750f1ad9597be21abace78c6378c9
diff --git a/deps_src/SDL3_image b/deps_src/SDL3_image
deleted file mode 160000
index 11154af..0000000
--- a/deps_src/SDL3_image
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11154afb7855293159588b245b446a4ef09e574f
diff --git a/deps_src/cglm b/deps_src/cglm
deleted file mode 160000
index 144d1e7..0000000
--- a/deps_src/cglm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 144d1e7c29b3b0c6dede7917a0476cc95248559c
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..d040b57
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,10 @@
+project('webgpu', 'c',
+  default_options: 'default_library=static')
+
+sdl3_deps = [dependency('sdl3'), dependency('sdl3_image')]
+cglm_dep = dependency('cglm')
+
+executable('webgpu', 'src/main.c',
+  win_subsystem: 'windows',
+  dependencies: [sdl3_deps,cglm_dep]
+)
diff --git a/subprojects/cglm.wrap b/subprojects/cglm.wrap
new file mode 100644
index 0000000..19371e9
--- /dev/null
+++ b/subprojects/cglm.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = cglm-0.9.6
+source_url = https://github.com/recp/cglm/archive/refs/tags/v0.9.6.tar.gz
+source_filename = cglm-0.9.6.tar.gz
+source_hash = be5e7d384561eb0fca59724a92b7fb44bf03e588a7eae5123a7d796002928184
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cglm_0.9.6-1/cglm-0.9.6.tar.gz
+wrapdb_version = 0.9.6-1
+
+[provide]
+cglm = cglm_dep
diff --git a/deps_src/dawn b/subprojects/dawn
similarity index 100%
rename from deps_src/dawn
rename to subprojects/dawn
diff --git a/subprojects/sdl3.wrap b/subprojects/sdl3.wrap
new file mode 100644
index 0000000..4f46f83
--- /dev/null
+++ b/subprojects/sdl3.wrap
@@ -0,0 +1,13 @@
+[wrap-file]
+directory = SDL3-3.2.10
+source_url = https://github.com/libsdl-org/SDL/releases/download/release-3.2.10/SDL3-3.2.10.tar.gz
+source_filename = SDL3-3.2.10.tar.gz
+source_hash = f87be7b4dec66db4098e9c167b2aa34e2ca10aeb5443bdde95ae03185ed513e0
+patch_filename = sdl3_3.2.10-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/sdl3_3.2.10-1/get_patch
+patch_hash = 64aeb3f36924c2a6c47c49a6fedee7b4e2512aa5afd72242e0e63b242047f887
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl3_3.2.10-1/SDL3-3.2.10.tar.gz
+wrapdb_version = 3.2.10-1
+
+[provide]
+sdl3 = sdl3_dep
diff --git a/subprojects/sdl3_image.wrap b/subprojects/sdl3_image.wrap
new file mode 100644
index 0000000..f597267
--- /dev/null
+++ b/subprojects/sdl3_image.wrap
@@ -0,0 +1,13 @@
+[wrap-file]
+directory = SDL3_image-3.2.4
+source_url = https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.4/SDL3_image-3.2.4.tar.gz
+source_filename = SDL3_image-3.2.4.tar.gz
+source_hash = a725bd6d04261fdda0dd8d950659e1dc15a8065d025275ef460d32ae7dcfc182
+patch_filename = sdl3_image_3.2.4-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/sdl3_image_3.2.4-1/get_patch
+patch_hash = c4961a7d6cf7e3e291fc631b81cab25987648516b5a984e2ba7cc730fddd6804
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/sdl3_image_3.2.4-1/SDL3_image-3.2.4.tar.gz
+wrapdb_version = 3.2.4-1
+
+[provide]
+sdl3_image = sdl3_image_dep