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

diff --git a/src/Makefile b/src/Makefile
index 6d7f100..7620e21 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,10 +2,12 @@
 CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
 MAIN = main.o
 OBJ = log.o document.o view.o screen.o
-LIB = `sdl2-config --libs` -lGL
+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 += `sdl2-config --cflags` -I`pwd`
+CFLAGS += -I../contrib/include/SDL2 -I`pwd`
 
 LINKOBJ = $(OBJPATHS)
 
@@ -16,7 +18,7 @@ BIN = ../bin/ipdf
 all : $(BIN)
 
 tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
-	$(CXX) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB)
+	$(CXX) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH)
 
 runtests : tests/runtests.sh
 	cd tests; ./runtests.sh
@@ -24,7 +26,7 @@ runtests : tests/runtests.sh
 
 $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 	@mkdir -p $(dir $@)
-	$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB)
+	$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
 
 ../obj/%.o : %.cpp
 	@mkdir -p $(dir $@)