X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=94d6f1f2db89f2e8f112cb4f312353f784f0e10e;hp=e4e2df54d76c7dc31bda132892a951d38916799c;hb=f06cfbc2d5986de9f9489e5cd9424231f310d471;hpb=2c938c2219bb9d27830bb7412690887f6963d4af

diff --git a/src/Makefile b/src/Makefile
index e4e2df5..94d6f1f 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 -rdynamic
 MAIN = main.o
-OBJ = log.o real.o document.o view.o screen.o vfpu.o graphicsbuffer.o framebuffer.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 add_digits_asm.o sub_digits_asm.o mul_digits_asm.o arbint.o
 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
 
@@ -31,7 +30,7 @@ RM = rm -f
 BIN = ../bin/ipdf
 
 
-
+all : DEF = -DREAL=1
 all : $(BIN)
 
 single : DEF = -DREAL=0
@@ -40,6 +39,17 @@ 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.
@@ -59,10 +69,14 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 
 -include $(DEPS)
 
-../obj/%.o : %.cpp
+../obj/%.o : %.cpp main.h
 	@mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
 
+../obj/%_asm.o : %_asm.s main.h
+	@mkdir -p $(dir $@)
+	$(CXX) -c -o $@ $<
+
 -include $(DEPS)
 
 clean_bin :
@@ -74,7 +88,6 @@ clean :
 	$(RM) tests/*.test
 	$(RM) tests/*.out
 	$(RM) tests/*.err
-	
 
 clean_full: clean
 	$(RM) *.*~