X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=6dbb2e13d5533cac420c47034fdf6e880895c716;hp=f3c287c22ce374dd49ee242bf28e3b655f9daa26;hb=f59f24dff392428d7219ba2d6be5e1e81c344ee0;hpb=700f1449af19115ff2bbe50ad67ea7c73f9aa5cd

diff --git a/src/Makefile b/src/Makefile
index f3c287c..6dbb2e1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,10 +1,9 @@
 #Makefile
 ARCH := $(shell uname -m)
 # TODO: stb_truetype doesn't compile with some of these warnings.
-CXX = g++ -std=gnu++0x -g
-# -Wall -Werror -Wshadow -pedantic
+CXX = g++ -std=gnu++0x -g -Wall -Werror -Wshadow -pedantic
 MAIN = main.o
-OBJ = log.o document.o view.o screen.o vfpu.o stb_truetype.o
+OBJ = log.o real.o bezier.o document.o objectrenderer.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
 
@@ -23,7 +22,7 @@ MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
-
+DEF = -DREAL=1
 
 LINKOBJ = $(OBJPATHS)
 
@@ -31,22 +30,48 @@ RM = rm -f
 BIN = ../bin/ipdf
 
 
+
 all : $(BIN)
 
+single : DEF = -DREAL=0
+single : $(BIN)
+
+double : DEF = -DREAL=1
+double : $(BIN)
+
+demo : $(BIN) ../tools/stream_plot.py
+	mkdir -p ../data/
+	$(RM) ../data/performance.dat
+	./ipdf | tee ../data/performance.dat | ../tools/stream_plot.py 2>/dev/null
+
+movie : $(BIN) ../tools/stream_plot.py
+	mkdir -p ../data/
+	$(RM) ../data/performance.dat
+	$(RM) ../data/movie.ogv
+	./ipdf | tee ../data/performance.dat | ../tools/stream_plot.py 2>/dev/null & recordmydesktop --fps 10 --on-the-fly-encoding -o ../data/movie.ogv
+
+# The tests will compile with the default REAL definition
+# To change that you can run as `make DEFS="REAL=X" tests/<target>` where X is your chosen type
+# But remember to make clean first.
 tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
 	$(CXX) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH)
 
+-include $(DEPS)
+
 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)
 
+-include $(DEPS)
+
 ../obj/%.o : %.cpp
 	@mkdir -p $(dir $@)
-	$(CXX) $(CFLAGS) -c -MMD -o $@ $<
+	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
 
 -include $(DEPS)
 
@@ -59,7 +84,6 @@ clean :
 	$(RM) tests/*.test
 	$(RM) tests/*.out
 	$(RM) tests/*.err
-	
 
 clean_full: clean
 	$(RM) *.*~