X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=ec8789ace3a368d5884f65df73a485ec532bbaf7;hp=d7247ce83598b0430cc34fa3bc37ad9ec480f5d5;hb=a2fab335f6502b3a0a37055486620615e643ad35;hpb=e12f1118cca4997c895c5ece32900be74f59ecdd

diff --git a/src/Makefile b/src/Makefile
index d7247ce..ec8789a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,12 @@
 #Makefile
-ARCH := $(shell uname -i)
-CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
+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 -rdynamic
 MAIN = main.o
-OBJ = log.o document.o view.o screen.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
-LIB_unknown = $(LIB_x86_64)
+
 MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
 MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
 TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
@@ -14,14 +15,14 @@ OBJPATHS = $(OBJ:%=../obj/%)
 DEPS := $(OBJPATHS:%.o=%.d)
 CFLAGS_x86_64 := -I../contrib/include/SDL2 -I`pwd`
 CFLAGS_i386 := -I../contrib/include32/SDL2 -I`pwd`
-CFLAGS_unknown = $(CFLAGS_x86_64)
+
 
 LIB := $(LIB_$(ARCH))
 MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
-
+DEF = -DREAL=1
 
 LINKOBJ = $(OBJPATHS)
 
@@ -29,22 +30,52 @@ RM = rm -f
 BIN = ../bin/ipdf
 
 
+all : DEF = -DREAL=1
 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)
 
-../obj/%.o : %.cpp
+-include $(DEPS)
+
+../obj/%.o : %.cpp main.h
 	@mkdir -p $(dir $@)
-	$(CXX) $(CFLAGS) -c -MMD -o $@ $<
+	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
+
+../obj/%_asm.o : %_asm.s main.h
+	@mkdir -p $(dir $@)
+	$(CXX) -c -o $@ $<
 
 -include $(DEPS)
 
@@ -57,7 +88,6 @@ clean :
 	$(RM) tests/*.test
 	$(RM) tests/*.out
 	$(RM) tests/*.err
-	
 
 clean_full: clean
 	$(RM) *.*~