medfall

commit 8cfe4f3afb92601b49cb74861c67c4d5e69772e9
parent 05f9f7f05b540711edc27cc762b586b4d8ea50c7
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Mon Oct 12 11:21:13 +0100

Makefile cleanup

Diffstat:
Makefile
 | 
18
+++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,8 +1,12 @@
 all: medfall bsp.so hm.so pp btt.so
 
 MAINOBJS = main.o gl.o memory_arena.o
-BSPOBJS = bsp.o bsp_renderer.o memory_arena.o immediate.o
-HMOBJS = hm.o heightmap.o terrain_manager.o memory_arena.o work_queue.o immediate.o stb_truetype.o stb_image.o stb_perlin.o
+
+COMMONOBJS = memory_arena.o work_queue.o immediate.o stb_truetype.o stb_image.o
+BSPOBJS = bsp.o bsp_renderer.o
+HMOBJS = hm.o heightmap.o terrain_manager.o stb_perlin.o
+BTTOBJS = btt.o heightmap.o gpubtt.o
+
 PPOBJS = pp.o stb_image.o stb_image_write.o
 
 WARNINGS = -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-write-strings -Wno-char-subscripts
@@ -23,18 +27,18 @@ picky: all
 medfall: $(MAINOBJS)
 	$(CXX) $^ $(LDFLAGS) -o $@
 
-hm.so: $(HMOBJS)
+hm.so: $(COMMONOBJS) $(HMOBJS)
+	$(CXX) $^ $(LDFLAGS) -o $@ -shared
+
+bsp.so: $(COMMONOBJS) $(BSPOBJS)
 	$(CXX) $^ $(LDFLAGS) -o $@ -shared
 
-bsp.so: $(BSPOBJS)
+btt.so: $(COMMONOBJS) $(BTTOBJS)
 	$(CXX) $^ $(LDFLAGS) -o $@ -shared
 
 pp: $(PPOBJS)
 	$(CXX) $^ $(LDFLAGS) -o $@
 
-btt.so: btt.o heightmap.o memory_arena.o work_queue.o stb_image.o immediate.o gpubtt.o
-	$(CXX) $^ $(LDFLAGS) -o $@ -shared
-
 clean:
 	rm -f medfall bsp.so hm.so pp *.o