X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=a26843fa601e6a6281b782b66c175cc9f0a3fbf2;hp=e4e2df54d76c7dc31bda132892a951d38916799c;hb=e7e4a7ad5c977ae089bab7081e7931fd5e423cc1;hpb=2c938c2219bb9d27830bb7412690887f6963d4af diff --git a/src/Makefile b/src/Makefile index e4e2df5..a26843f 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 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL @@ -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/` where X is your chosen type # But remember to make clean first. @@ -59,7 +69,7 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN) -include $(DEPS) -../obj/%.o : %.cpp +../obj/%.o : %.cpp main.h @mkdir -p $(dir $@) $(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $< @@ -74,7 +84,6 @@ clean : $(RM) tests/*.test $(RM) tests/*.out $(RM) tests/*.err - clean_full: clean $(RM) *.*~