X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=7620e21b09cd92d3d2e9f6e44d591335103c6666;hp=6ab41c8e54f79c10fac6ab667dad6c817d176586;hb=26524b787a61cb6d8bb5f2f6925855768ac9471f;hpb=7daf0a17868a6ab712b7a7476d269133036368ef

diff --git a/src/Makefile b/src/Makefile
index 6ab41c8..7620e21 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,13 @@
 #Makefile
 CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
-OBJ = log.o main.o document.o view.o
-LIB = #-lSDL2
+MAIN = main.o
+OBJ = log.o document.o view.o screen.o
+LIB = ../contrib/lib/libSDL2-2.0.so.0 -lGL
+MAINRPATH = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
+TESTRPATH = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
 OBJPATHS = $(OBJ:%=../obj/%)
 DEPS := $(OBJPATHS:%.o=%.d)
+CFLAGS += -I../contrib/include/SDL2 -I`pwd`
 
 LINKOBJ = $(OBJPATHS)
 
@@ -13,24 +17,38 @@ BIN = ../bin/ipdf
 
 all : $(BIN)
 
-$(BIN) : $(LINKOBJ)
+tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
+	$(CXX) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH)
+
+runtests : tests/runtests.sh
+	cd tests; ./runtests.sh
+
+
+$(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 	@mkdir -p $(dir $@)
-	$(CXX) -o $(BIN) $(LINKOBJ) $(LIB)
+	$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
 
 ../obj/%.o : %.cpp
 	@mkdir -p $(dir $@)
-	$(CXX) -c -MMD -o $@ $<
+	$(CXX) $(CFLAGS) -c -MMD -o $@ $<
 
 -include $(DEPS)
 
+clean_bin :
+	$(RM) $(BIN)
+
 clean :
-	$(RM) $(BIN) $(DEPS) $(LINKOBJ)
+	$(RM) $(BIN) $(DEPS) $(LINKOBJ) ../obj/$(MAIN)
+	$(RM) tests/*~
+	$(RM) tests/*.test
+	$(RM) tests/*.out
+	$(RM) tests/*.err
+	
 
-clean_full: #cleans up all backup files
-	$(RM) $(BIN) $(DEPS) $(LINKOBJ)
+clean_full: clean
 	$(RM) *.*~
 	$(RM) *~
-	$(RM) *.o
+