C++11 lambdas - are they really worth it?

[ipdf/code.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index c39d7dc..ec8789a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +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 shaderprogram.o stb_truetype.o gl_core44.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 div_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
 
@@ -30,7 +30,7 @@ RM = rm -f
 BIN = ../bin/ipdf
 
 
-
+all : DEF = -DREAL=1
 all : $(BIN)
 
 single : DEF = -DREAL=0
@@ -39,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.
@@ -58,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 :
@@ -73,7 +88,6 @@ clean :
        $(RM) tests/*.test
        $(RM) tests/*.out
        $(RM) tests/*.err
-       
 
 clean_full: clean
        $(RM) *.*~