git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
David's secret SDL2 magic sauce!
[ipdf/code.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
6d7f100
..
7620e21
100644
(file)
--- 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
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)
OBJPATHS = $(OBJ:%=../obj/%)
DEPS := $(OBJPATHS:%.o=%.d)
-CFLAGS +=
`sdl2-config --cflags`
-I`pwd`
+CFLAGS +=
-I../contrib/include/SDL2
-I`pwd`
LINKOBJ = $(OBJPATHS)
LINKOBJ = $(OBJPATHS)
@@
-16,7
+18,7
@@
BIN = ../bin/ipdf
all : $(BIN)
tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
all : $(BIN)
tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
- $(CXX) -o
[email protected]
$(LINKOBJ) ../obj/
[email protected]
$(LIB)
+ $(CXX) -o
[email protected]
$(LINKOBJ) ../obj/
[email protected]
$(LIB)
$(TESTRPATH)
runtests : tests/runtests.sh
cd tests; ./runtests.sh
runtests : tests/runtests.sh
cd tests; ./runtests.sh
@@
-24,7
+26,7
@@
runtests : tests/runtests.sh
$(BIN) : $(LINKOBJ) ../obj/$(MAIN)
@mkdir -p $(dir $@)
$(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 $@)
../obj/%.o : %.cpp
@mkdir -p $(dir $@)
UCC
git Repository :: git.ucc.asn.au