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
6ab41c8
..
7620e21
100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,9
+1,13
@@
#Makefile
CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
#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)
OBJPATHS = $(OBJ:%=../obj/%)
DEPS := $(OBJPATHS:%.o=%.d)
+CFLAGS += -I../contrib/include/SDL2 -I`pwd`
LINKOBJ = $(OBJPATHS)
LINKOBJ = $(OBJPATHS)
@@
-13,24
+17,38
@@
BIN = ../bin/ipdf
all : $(BIN)
all : $(BIN)
-$(BIN) : $(LINKOBJ)
+tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
+ $(CXX) -o
[email protected]
$(LINKOBJ) ../obj/
[email protected]
$(LIB) $(TESTRPATH)
+
+runtests : tests/runtests.sh
+ cd tests; ./runtests.sh
+
+
+$(BIN) : $(LINKOBJ) ../obj/$(MAIN)
@mkdir -p $(dir $@)
@mkdir -p $(dir $@)
- $(CXX) -o $(BIN) $(LINKOBJ)
$(LIB
)
+ $(CXX) -o $(BIN) $(LINKOBJ)
../obj/$(MAIN) $(LIB) $(MAINRPATH
)
../obj/%.o : %.cpp
@mkdir -p $(dir $@)
../obj/%.o : %.cpp
@mkdir -p $(dir $@)
- $(CXX) -c -MMD -o $@ $<
+ $(CXX)
$(CFLAGS)
-c -MMD -o $@ $<
-include $(DEPS)
-include $(DEPS)
+clean_bin :
+ $(RM) $(BIN)
+
clean :
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) *.*~
$(RM) *~
- $(RM) *.o
+
UCC
git Repository :: git.ucc.asn.au