From 84873f1e983c617174e7b5c49c6000617d28a8bd Mon Sep 17 00:00:00 2001
From: Abdelrahman <said.abdelrahman89@gmail.com>
Date: Sat, 24 Feb 2024 20:44:44 +0000
Subject: [PATCH] Replace separate aliases and arena implementations with
 stdlib submodule

---
 .gitmodules    |  6 +++---
 compile        | 18 +++++++++++++++---
 intern/aliases |  1 -
 intern/wizapp  |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)
 delete mode 160000 intern/aliases
 create mode 160000 intern/wizapp

diff --git a/.gitmodules b/.gitmodules
index fdbee00..8c70197 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "intern/aliases"]
-	path = intern/aliases
-	url = https://git.thewizardapprentice.com/abdelrahman/c-cpp-aliases.git
+[submodule "intern/wizapp"]
+	path = intern/wizapp
+	url = https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib.git
diff --git a/compile b/compile
index 465e3ff..8fc4b88 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,21 @@
 #!/bin/bash
 
 CC=clang
-CFLAGS="-g -Wall -Iinclude -Iintern $(pkg-config --cflags sdl2)"
+CFLAGS="-g -Wall $(pkg-config --cflags sdl2)"
 LIBS="$(pkg-config --libs sdl2) -lm"
-SRC=src/*.c
+INCLUDE="\
+	-Iinclude \
+	-Iintern/wizapp/aliases \
+	-Iintern/wizapp/cpath/include \
+	-Iintern/wizapp/dstr/include \
+	$(find intern/wizapp/mem/include/ -type d | xargs -I{} printf "-I{} ") \
+"
+SRC="\
+	intern/wizapp/cpath/src/*.c \
+	intern/wizapp/dstr/src/*.c \
+	intern/wizapp/mem/src/*/*.c \
+	src/*.c \
+"
 OUT=main
 
-(set -x ; $CC $CFLAGS $LIBS $SRC -o $OUT)
+(set -x ; $CC $CFLAGS $INCLUDE $LIBS $SRC -o $OUT)
diff --git a/intern/aliases b/intern/aliases
deleted file mode 160000
index f95f3aa..0000000
--- a/intern/aliases
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f95f3aa499910286876c1f2cdceea8146ebcf7b1
diff --git a/intern/wizapp b/intern/wizapp
new file mode 160000
index 0000000..b8db582
--- /dev/null
+++ b/intern/wizapp
@@ -0,0 +1 @@
+Subproject commit b8db582098a866aa56c62d0b2b6351ea08411f6b