X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=d7247ce83598b0430cc34fa3bc37ad9ec480f5d5;hp=3e8d8a02e41ece0ebb77bb2e20978bed40cbebe8;hb=8e8a5a3e29f4f5741cdbdf4e69dd966e5c89c05d;hpb=fd8f00531c67a2a187213ca6830114ff84a8ec4f

diff --git a/src/Makefile b/src/Makefile
index 3e8d8a0..d7247ce 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,27 @@
 #Makefile
+ARCH := $(shell uname -i)
 CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
-OBJ = log.o tests/saveload.o document.o view.o screen.o
-LIB = `sdl2-config --libs` -lGL
+MAIN = main.o
+OBJ = log.o document.o view.o screen.o
+LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
+LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
+LIB_unknown = $(LIB_x86_64)
+MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
+MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
+TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
+TESTRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32'
 OBJPATHS = $(OBJ:%=../obj/%)
 DEPS := $(OBJPATHS:%.o=%.d)
-CFLAGS += `sdl2-config --cflags`
+CFLAGS_x86_64 := -I../contrib/include/SDL2 -I`pwd`
+CFLAGS_i386 := -I../contrib/include32/SDL2 -I`pwd`
+CFLAGS_unknown = $(CFLAGS_x86_64)
+
+LIB := $(LIB_$(ARCH))
+MAINRPATH := $(MAINRPATH_$(ARCH))
+TESTRPATH := $(TESTRPATH_$(ARCH))
+CFLAGS := $(CFLAGS_$(ARCH))
+
+
 
 LINKOBJ = $(OBJPATHS)
 
@@ -14,9 +31,16 @@ 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 $@)
@@ -24,14 +48,21 @@ $(BIN) : $(LINKOBJ)
 
 -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
+