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
Fix an intel LG warning by orphaning text memory
[ipdf/code.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
ef5bff1
..
c39d7dc
100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,8
+1,9
@@
#Makefile
ARCH := $(shell uname -m)
#Makefile
ARCH := $(shell uname -m)
-CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
+# TODO: stb_truetype doesn't compile with some of these warnings.
+CXX = g++ -std=gnu++0x -g -Wall -Werror -Wshadow -pedantic
MAIN = main.o
MAIN = main.o
-OBJ = log.o real.o document.o view.o screen.o vfpu.o
+OBJ = log.o real.o document.o view.o screen.o vfpu.o
graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o
LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
@@
-29,6
+30,7
@@
RM = rm -f
BIN = ../bin/ipdf
BIN = ../bin/ipdf
+
all : $(BIN)
single : DEF = -DREAL=0
all : $(BIN)
single : DEF = -DREAL=0
@@
-43,14
+45,19
@@
double : $(BIN)
tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
$(CXX) -o
[email protected]
$(LINKOBJ) ../obj/
[email protected]
$(LIB) $(TESTRPATH)
tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
$(CXX) -o
[email protected]
$(LINKOBJ) ../obj/
[email protected]
$(LIB) $(TESTRPATH)
+-include $(DEPS)
+
runtests : tests/runtests.sh
cd tests; ./runtests.sh
$(BIN) : $(LINKOBJ) ../obj/$(MAIN)
runtests : tests/runtests.sh
cd tests; ./runtests.sh
$(BIN) : $(LINKOBJ) ../obj/$(MAIN)
+ echo $(LINKOBJ)
@mkdir -p $(dir $@)
$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
@mkdir -p $(dir $@)
$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
+-include $(DEPS)
+
../obj/%.o : %.cpp
@mkdir -p $(dir $@)
$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
../obj/%.o : %.cpp
@mkdir -p $(dir $@)
$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
UCC
git Repository :: git.ucc.asn.au