From 4618763c0e3a723bf4bb43c7b9edbce87240e0af Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 16 Apr 2021 11:23:27 -0400
Subject: Rebased feature/item on entry

---
 Makefile | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a83080a..da8417b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CC=g++
 LIBS=
 CFLAGS=-c -Wall -fPIC -std=c++20
 LDFLAGS=
-SOURCES=src/creature.cc src/dmtool.cc src/feature.cc src/item.cc src/test.cc src/utils.cc src/weapon.cc 
+SOURCES=src/armor.cc src/creature.cc src/dmtool.cc src/entry.cc src/feature.cc src/item.cc src/spellcasting.cc src/test.cc src/utils.cc src/weapon.cc 
 OBJECTS=$(SOURCES:.cc=.o)
 LIBRARY=
 EXECUTABLE=test
@@ -16,33 +16,46 @@ $(EXECUTABLE): $(OBJECTS)
 	$(CC) $(OBJECTS) -o $@ $(LDFLAGS) 
 
 
+src/armor.o: src/armor.cc src/armor.h src/item.h src/json.hpp src/entry.h \
+ src/jsonable.h src/utils.h src/settings.h src/creature.h
+	$(CC) $(CFLAGS) $< -o $@ 
+
 src/creature.o: src/creature.cc src/creature.h src/json.hpp \
  src/jsonable.h src/utils.h src/settings.h src/dice.h src/rules.h \
- src/feature.h src/weapon.h src/item.h src/armor.h
+ src/feature.h src/entry.h src/weapon.h src/item.h src/armor.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
 src/dmtool.o: src/dmtool.cc src/creature.h src/json.hpp src/jsonable.h \
- src/utils.h src/settings.h src/feature.h
+ src/utils.h src/settings.h src/feature.h src/entry.h
+	$(CC) $(CFLAGS) $< -o $@ 
+
+src/entry.o: src/entry.cc src/entry.h src/json.hpp src/jsonable.h \
+ src/utils.h src/settings.h
+	$(CC) $(CFLAGS) $< -o $@ 
+
+src/feature.o: src/feature.cc src/json.hpp src/feature.h src/entry.h \
+ src/jsonable.h src/utils.h src/settings.h src/spellcasting.h src/spell.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
-src/feature.o: src/feature.cc src/json.hpp src/feature.h src/jsonable.h \
- src/utils.h src/settings.h src/spellcasting.h src/spell.h
+src/item.o: src/item.cc src/json.hpp src/item.h src/entry.h \
+ src/jsonable.h src/utils.h src/settings.h src/weapon.h src/armor.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
-src/item.o: src/item.cc src/json.hpp src/item.h src/jsonable.h \
- src/utils.h src/settings.h src/weapon.h src/armor.h
+src/spellcasting.o: src/spellcasting.cc src/spellcasting.h src/feature.h \
+ src/json.hpp src/entry.h src/jsonable.h src/utils.h src/settings.h \
+ src/spell.h src/creature.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
 src/test.o: src/test.cc src/creature.h src/json.hpp src/jsonable.h \
- src/utils.h src/settings.h src/feature.h src/rules.h src/item.h \
- src/armor.h src/weapon.h
+ src/utils.h src/settings.h src/feature.h src/entry.h src/rules.h \
+ src/item.h src/armor.h src/weapon.h src/spellcasting.h src/spell.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
 src/utils.o: src/utils.cc src/utils.h src/json.hpp src/settings.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
-src/weapon.o: src/weapon.cc src/json.hpp src/weapon.h src/item.h \
- src/jsonable.h src/utils.h src/settings.h src/creature.h
+src/weapon.o: src/weapon.cc src/weapon.h src/item.h src/json.hpp \
+ src/entry.h src/jsonable.h src/utils.h src/settings.h src/creature.h
 	$(CC) $(CFLAGS) $< -o $@ 
 
 clean:
-- 
cgit v1.2.3