X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=95ff5be0f8576d057458fbf8fbc4312f5bf3c35f;hp=ef5bff164aa88bb370e974691ecaa2a214ea0221;hb=a851cf197844a2eb15fd5ee2c350ee296e415dca;hpb=e164c93218ed4599614f4f6e5e815429a3fedbf7

diff --git a/src/Makefile b/src/Makefile
index ef5bff1..95ff5be 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,10 @@
 #Makefile
 ARCH := $(shell uname -m)
-CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
+# TODO: stb_truetype doesn't compile with some of these warnings.
+CXX = g++ -std=gnu++0x -g
+# -Wall -Werror -Wshadow -pedantic
 MAIN = main.o
-OBJ = log.o real.o document.o view.o screen.o vfpu.o
+OBJ = log.o real.o document.o view.o screen.o vfpu.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o
 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
 
@@ -29,6 +31,7 @@ RM = rm -f
 BIN = ../bin/ipdf
 
 
+
 all : $(BIN)
 
 single : DEF = -DREAL=0
@@ -43,14 +46,19 @@ double : $(BIN)
 tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
 	$(CXX) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH)
 
+-include $(DEPS)
+
 runtests : tests/runtests.sh
 	cd tests; ./runtests.sh
 
 
 $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
+	echo $(LINKOBJ)
 	@mkdir -p $(dir $@)
 	$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
 
+-include $(DEPS)
+
 ../obj/%.o : %.cpp
 	@mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<