From 4f11e235022f9cbd568a2bef8258d04f17b6a1a5 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Sun, 25 Aug 2019 13:39:12 -0400
Subject: Build with cards submodule

---
 .gitignore |  2 --
 Makefile   | 19 ++++++++++++-------
 freecell.c |  5 +++--
 sol.c      |  5 +++--
 stack.h    |  4 ++--
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index c15f5a2..cf601f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-*.bmp
 *.o
 CARDS.DLL
 FREECELL.EXE
 SOL.EXE
 config.mk
-dump
 freecell
 sol
diff --git a/Makefile b/Makefile
index 073f0be..90e71e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
 CFLAGS += -std=c99 -Wall -Wextra -Wpedantic
+CFLAGS += -Icards
 
 include config.mk
 
-BINS = dump freecell sol
+BINS = freecell sol
+OBJS = ${BINS:%=%.o}
 
-all: $(BINS)
+all: ${BINS}
 
-$(BINS): cards.o
+${BINS}: cards/cards.o
 
 .o:
-	$(CC) $(LDFLAGS) $< cards.o $(LDLIBS) -o $@
+	${CC} ${LDFLAGS} $< cards/cards.o ${LDLIBS} -o $@
 
-cards.o dump.o freecell.o sol.o: cards.h
+${OBJS} cards/cards.o: cards/cards.h
 
-freecell.o sol.o: asset.h layout.h stack.h
+${OBJS}: asset.h layout.h stack.h
+
+cards/cards.h:
+	git submodule update --init
 
 clean:
-	rm -f $(BINS) *.o *.bmp
+	rm -f ${BINS} *.o cards/*.o
diff --git a/freecell.c b/freecell.c
index b7f6378..652ce3d 100644
--- a/freecell.c
+++ b/freecell.c
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <SDL.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
+#include <SDL.h>
+#include <cards.h>
+
 #include "asset.h"
-#include "cards.h"
 #include "layout.h"
 #include "stack.h"
 
diff --git a/sol.c b/sol.c
index cf643f2..f16c7b6 100644
--- a/sol.c
+++ b/sol.c
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <SDL.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
+#include <SDL.h>
+#include <cards.h>
+
 #include "asset.h"
-#include "cards.h"
 #include "layout.h"
 #include "stack.h"
 
diff --git a/stack.h b/stack.h
index f5140df..6daf9d0 100644
--- a/stack.h
+++ b/stack.h
@@ -17,11 +17,11 @@
 #ifndef STACK_H
 #define STACK_H
 
-#include <SDL_stdinc.h>
 #include <assert.h>
 #include <stdlib.h>
 
-#include "cards.h"
+#include <SDL_stdinc.h>
+#include <cards.h>
 
 #ifndef STACK_CAP
 #define STACK_CAP 52
-- 
cgit 1.4.1