diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fac6899
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,24 @@
+[submodule "deps/SDL"]
+	path = deps/SDL
+	url = git@github.com:libsdl-org/SDL.git
+[submodule "deps/SDL_image"]
+	path = deps/SDL_image
+	url = git@github.com:libsdl-org/SDL_image.git
+[submodule "deps/SDL_mixer"]
+	path = deps/SDL_mixer
+	url = git@github.com:libsdl-org/SDL_mixer.git
+[submodule "deps/SDL_ttf"]
+	path = deps/SDL_ttf
+	url = git@github.com:libsdl-org/SDL_ttf.git
+[submodule "deps/libakgl"]
+	path = deps/libakgl
+	url = https://source.home.aklabs.net/andrew/libakgl.git
+[submodule "deps/libsdlerror"]
+	path = deps/libakerror
+	url = https://source.home.aklabs.net/andrew/libsdlerror.git
+[submodule "deps/libakstdlib"]
+	path = deps/libakstdlib
+	url = https://source.home.aklabs.net/andrew/libakstdlib.git
+[submodule "deps/jansson"]
+	path = deps/jansson
+	url = git@github.com:akheron/jansson.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..6c1c88c
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 3.10)
+project(akgltest LANGUAGES C)
+
+add_subdirectory(deps/jansson EXCLUDE_FROM_ALL)
+add_subdirectory(deps/libakerror EXCLUDE_FROM_ALL)
+add_subdirectory(deps/libakstdlib EXCLUDE_FROM_ALL)
+add_subdirectory(deps/SDL EXCLUDE_FROM_ALL)
+add_subdirectory(deps/SDL_image EXCLUDE_FROM_ALL)
+add_subdirectory(deps/SDL_mixer EXCLUDE_FROM_ALL)
+add_subdirectory(deps/SDL_ttf EXCLUDE_FROM_ALL)
+add_subdirectory(deps/libakgl EXCLUDE_FROM_ALL)
+
+set(prefix      ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}")
+set(libdir      "\${exec_prefix}/lib")
+set(includedir  "\${prefix}/include")
+
+# Add include directories
+include_directories(${SDL3_INCLUDE_DIRS})
+add_executable(akgltest src/akgltest.c)
+
+target_link_libraries(akgltest
+  PRIVATE
+    akerror::akerror
+    akstdlib::akstdlib
+    akgl::akgl
+    SDL3::SDL3
+    SDL3_image::SDL3_image
+    SDL3_mixer::SDL3_mixer
+    SDL3_ttf::SDL3_ttf
+    jansson::jansson
+    -lm
+)
+  
diff --git a/Makefile b/Makefile
deleted file mode 100644
index edd3a77..0000000
--- a/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-SDLFLAGS_CC:=$(shell pkg-config sdl3 --cflags) $(shell pkg-config sdl3-ttf --cflags) $(shell pkg-config sdl3-image --cflags) $(shell pkg-config akgl --cflags) $(shell pkg-config akerror --cflags)
-SDLFLAGS_LD:=$(shell pkg-config sdl3 --libs) $(shell pkg-config sdl3-ttf --libs) $(shell pkg-config sdl3-mixer --libs) $(shell pkg-config sdl3-image --libs) $(shell pkg-config akgl --libs) $(shell pkg-config akerror --libs) -lasound
-CC:=$(shell which gcc)
-LD:=$(shell which ld)
-
-SRCFILES:=$(shell find src -type f -name '*.c')
-OBJFILES:=$(patsubst %.c,%.o,$(SRCFILES))
-
-LDFLAGS:=-L/home/andrew/local/lib -lsdlerror -lakgl -lgcov -lbox2d -ljansson
-CFLAGS:=-I/home/andrew/local/include -g3 -gdwarf-2 -I./include/ -Wall -fstack-usage -Werror=analyzer-use-of-uninitialized-value -Werror=unused-result -Werror=multistatement-macros
-
-DISTFILE:=dist/akgl-test
-
-.PHONY: lib
-.PHONY: clean
-
-all: $(DISTFILE)
-
-clean:
-	rm -fr $(OBJFILES) ${DISTFILE}
-
-src/%.o: src/%.c $(LIB_HEADERS)
-	$(CC) -c -o $@ $(CFLAGS) $(SDLFLAGS_CC) $<
-
-$(DISTFILE): $(OBJFILES)
-	$(CC) -o $@ $^ $(LDFLAGS) $(SDLFLAGS_LD) -lm -lwayland-client
diff --git a/assets/C64_Pro-STYLE.ttf b/assets/C64_Pro-STYLE.ttf
new file mode 100644
index 0000000..a6c30a6
Binary files /dev/null and b/assets/C64_Pro-STYLE.ttf differ
diff --git a/deps/SDL b/deps/SDL
new file mode 160000
index 0000000..f30ec99
--- /dev/null
+++ b/deps/SDL
@@ -0,0 +1 @@
+Subproject commit f30ec9940af42c08466a36e42fe6d5847f7c124f
diff --git a/deps/SDL_image b/deps/SDL_image
new file mode 160000
index 0000000..fcb9d0b
--- /dev/null
+++ b/deps/SDL_image
@@ -0,0 +1 @@
+Subproject commit fcb9d0b15f6bc4e22e9badedc5cdccee92eddcf4
diff --git a/deps/SDL_mixer b/deps/SDL_mixer
new file mode 160000
index 0000000..63bb682
--- /dev/null
+++ b/deps/SDL_mixer
@@ -0,0 +1 @@
+Subproject commit 63bb682ef02346a02c64ad2dd2276c89876c3eaa
diff --git a/deps/SDL_ttf b/deps/SDL_ttf
new file mode 160000
index 0000000..2eabf8b
--- /dev/null
+++ b/deps/SDL_ttf
@@ -0,0 +1 @@
+Subproject commit 2eabf8bcdf56a7a9adcb8c3505399d922a6f1007
diff --git a/deps/jansson b/deps/jansson
new file mode 160000
index 0000000..1eb7a81
--- /dev/null
+++ b/deps/jansson
@@ -0,0 +1 @@
+Subproject commit 1eb7a8129766153b5214153a00b1ae0e14e27a41
diff --git a/deps/libakerror b/deps/libakerror
new file mode 160000
index 0000000..768a235
--- /dev/null
+++ b/deps/libakerror
@@ -0,0 +1 @@
+Subproject commit 768a235da4eeb59e2c25c0553d64c1ad9345ad32
diff --git a/deps/libakgl b/deps/libakgl
new file mode 160000
index 0000000..6f62e67
--- /dev/null
+++ b/deps/libakgl
@@ -0,0 +1 @@
+Subproject commit 6f62e674d5bde3b1948aca17373bab37bdd0edb6
diff --git a/deps/libakstdlib b/deps/libakstdlib
new file mode 160000
index 0000000..dda645e
--- /dev/null
+++ b/deps/libakstdlib
@@ -0,0 +1 @@
+Subproject commit dda645e188d6740a50f7b9b86ffca20979bc6875
diff --git a/src/sdl3-gametest.c b/src/akgltest.c
similarity index 100%
rename from src/sdl3-gametest.c
rename to src/akgltest.c