From 022bb6b5cd0f1f9941fdfdad987b1e70c137096c Mon Sep 17 00:00:00 2001
From: Landon Curt Noll <github-mail@asthe.com>
Date: Wed, 8 Mar 2023 00:01:17 -0800
Subject: [PATCH] fix how to compile with SDL2, added SDL2_CONFIG to var.mk

Both 2014/maffiodo1 and 2018/giles now use ${SDL2_CONFIG}
to compile with SDL2.
---
 2014/maffiodo1/Makefile | 4 ++--
 2018/giles/Makefile     | 8 ++++----
 var.mk                  | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/2014/maffiodo1/Makefile b/2014/maffiodo1/Makefile
index 897b26ffa..9ed7a3a7f 100644
--- a/2014/maffiodo1/Makefile
+++ b/2014/maffiodo1/Makefile
@@ -105,7 +105,7 @@ CDEFINE=
 #CINCLUDE= -include stdio.h
 #CINCLUDE= -include stdlib.h -include stdio.h
 #CINCLUDE= -I ${X11_INCDIR}
-CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2
+CINCLUDE= `${SDL2_CONFIG} --cflags`
 
 # Optimization
 #
@@ -129,7 +129,7 @@ CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT}
 #LIBS=
 #LIBS= -lm
 #LIBS= -L ${X11_LIBDIR} -lX11
-LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL2
+LIBS= `${SDL2_CONFIG} --libs`
 
 # C compiler to use
 #
diff --git a/2018/giles/Makefile b/2018/giles/Makefile
index 0bb07ef4b..6d9c86a40 100644
--- a/2018/giles/Makefile
+++ b/2018/giles/Makefile
@@ -97,12 +97,12 @@ CDEFINE=
 
 # Include files that are needed to compile
 #
-CINCLUDE=
+#CINCLUDE=
 #CINCLUDE= -include stdlib.h
 #CINCLUDE= -include stdio.h
 #CINCLUDE= -include stdlib.h -include stdio.h
 #CINCLUDE= -I ${X11_INCDIR}
-CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2
+CINCLUDE= `${SDL2_CONFIG} --cflags`
 
 # Optimization
 #
@@ -123,10 +123,10 @@ CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT}
 
 # Libraries needed to build
 #
-LIBS=
+#LIBS=
 #LIBS= -lm
 #LIBS= -L ${X11_LIBDIR} -lX11
-LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL2
+LIBS= `${SDL2_CONFIG} --libs`
 
 # C compiler to use
 #
diff --git a/var.mk b/var.mk
index e424a3846..5e9a5f357 100644
--- a/var.mk
+++ b/var.mk
@@ -171,6 +171,7 @@ SCP= scp
 SCREEN= screen
 SCRIPT= script
 SDIFF= sdiff
+SDL2_CONFIG= sdl2-config
 SED= sed
 SEQ= seq
 SFTP= sftp