(20130126)

Makefile.common

@@ -1,59 +1,90 @@
-HEADS= \
-	Time.h \
-	Util.h \
-	Draw.h \
-	Input.h \
-	Audio.h \
-	Anim.h \
-	Entity.h \
-	GameLib.h \
-	GameEnts.h \
-	GameMap.h
 
+
+########################
+# GameLib Declarations #
+########################
+CFLAGS += -IGameLib
+HEADS= \
+	GameLib/Time.h \
+	GameLib/Util.h \
+	GameLib/Draw.h \
+	GameLib/Input.h \
+	GameLib/Audio.h \
+	GameLib/Anim.h \
+	GameLib/Entity.h \
+	GameLib/GameLib.h
 OBJS= \
-	$(BUILDDIR)/Time.o \
-	$(BUILDDIR)/Util.o \
-	$(BUILDDIR)/Draw.o \
-	$(BUILDDIR)/Input.o \
-	$(BUILDDIR)/Audio.o \
-	$(BUILDDIR)/Anim.o \
-	$(BUILDDIR)/Entity.o \
-	$(BUILDDIR)/GameLib.o \
+	$(BUILDDIR)/GameLib/Time.o \
+	$(BUILDDIR)/GameLib/Util.o \
+	$(BUILDDIR)/GameLib/Draw.o \
+	$(BUILDDIR)/GameLib/Input.o \
+	$(BUILDDIR)/GameLib/Audio.o \
+	$(BUILDDIR)/GameLib/Anim.o \
+	$(BUILDDIR)/GameLib/Entity.o \
+	$(BUILDDIR)/GameLib/GameLib.o \
+
+
+
+#####################
+# Game Declarations #
+#####################
+HEADS+= GameEnts.h GameMap.h
+
+OBJS+= \
 	$(BUILDDIR)/GameEnts.o \
 	$(BUILDDIR)/GameMap.o \
 	$(BUILDDIR)/main.o
 
 
+
+
+
+
+
+#################
+# General Rules #
+#################
 all: $(BUILDDIR) $(BUILDDIR)/$(RESULT)
 
 $(BUILDDIR):
 	mkdir $(BUILDDIR)
+	mkdir $(BUILDDIR)/GameLib
+
+clean:
+	rm -f $(OBJS) $(BUILDDIR)/$(RESULT)
+
+run: $(BUILDDIR)/$(RESULT)
+	./$(BUILDDIR)/$(RESULT) debug
 
 
 
-$(BUILDDIR)/Time.o: Time.c $(HEADS)
-	$(CC) -c Time.c -o $(BUILDDIR)/Time.o $(CFLAGS)
 
-$(BUILDDIR)/Util.o: Util.c $(HEADS)
-	$(CC) -c Util.c -o $(BUILDDIR)/Util.o $(CFLAGS)
 
-$(BUILDDIR)/Draw.o: Draw.c $(HEADS)
-	$(CC) -c Draw.c -o $(BUILDDIR)/Draw.o $(CFLAGS)
+#################
+# GameLib Rules #
+#################
+$(BUILDDIR)/GameLib/Time.o: GameLib/Time.c $(HEADS)
+	$(CC) -c GameLib/Time.c -o $(BUILDDIR)/GameLib/Time.o $(CFLAGS)
+$(BUILDDIR)/GameLib/Util.o: GameLib/Util.c $(HEADS)
+	$(CC) -c GameLib/Util.c -o $(BUILDDIR)/GameLib/Util.o $(CFLAGS)
+$(BUILDDIR)/GameLib/Draw.o: GameLib/Draw.c $(HEADS)
+	$(CC) -c GameLib/Draw.c -o $(BUILDDIR)/GameLib/Draw.o $(CFLAGS)
+$(BUILDDIR)/GameLib/Input.o: GameLib/Input.c $(HEADS)
+	$(CC) -c GameLib/Input.c -o $(BUILDDIR)/GameLib/Input.o $(CFLAGS)
+$(BUILDDIR)/GameLib/Audio.o: GameLib/Audio.c $(HEADS)
+	$(CC) -c GameLib/Audio.c -o $(BUILDDIR)/GameLib/Audio.o $(CFLAGS)
+$(BUILDDIR)/GameLib/Entity.o: GameLib/Entity.c $(HEADS)
+	$(CC) -c GameLib/Entity.c -o $(BUILDDIR)/GameLib/Entity.o $(CFLAGS)
+$(BUILDDIR)/GameLib/Anim.o: GameLib/Anim.c $(HEADS)
+	$(CC) -c GameLib/Anim.c -o $(BUILDDIR)/GameLib/Anim.o $(CFLAGS)
+$(BUILDDIR)/GameLib/GameLib.o: GameLib/GameLib.c $(HEADS)
+	$(CC) -c GameLib/GameLib.c -o $(BUILDDIR)/GameLib/GameLib.o $(CFLAGS)
 
-$(BUILDDIR)/Input.o: Input.c $(HEADS)
-	$(CC) -c Input.c -o $(BUILDDIR)/Input.o $(CFLAGS)
 
-$(BUILDDIR)/Audio.o: Audio.c $(HEADS)
-	$(CC) -c Audio.c -o $(BUILDDIR)/Audio.o $(CFLAGS)
 
-$(BUILDDIR)/Entity.o: Entity.c $(HEADS)
-	$(CC) -c Entity.c -o $(BUILDDIR)/Entity.o $(CFLAGS)
-
-$(BUILDDIR)/Anim.o: Anim.c $(HEADS)
-	$(CC) -c Anim.c -o $(BUILDDIR)/Anim.o $(CFLAGS)
-
-$(BUILDDIR)/GameLib.o: GameLib.c $(HEADS)
-	$(CC) -c GameLib.c -o $(BUILDDIR)/GameLib.o $(CFLAGS)
+##############
+# Game Rules #
+##############
 
 $(BUILDDIR)/GameEnts.o: GameEnts.c $(HEADS)
 	$(CC) -c GameEnts.c -o $(BUILDDIR)/GameEnts.o $(CFLAGS)
@@ -68,10 +99,5 @@ $(BUILDDIR)/$(RESULT): $(OBJS)
 	$(CC) -o $(BUILDDIR)/$(RESULT) $(OBJS) $(LIBS) $(CFLAGS)
 
 
-clean:
-	rm -f $(OBJS) $(BUILDDIR)/$(RESULT)
-
-run: $(BUILDDIR)/$(RESULT)
-	./$(BUILDDIR)/$(RESULT) debug