X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=f0733d415cdc5b5428134233d2a6c41d3622ac61;hp=64408edcb76542c0c14bd5c1704c7fc193703f7a;hb=7a83af96414ff156f56455ff7a5e7af01fc403b5;hpb=85e08223a33439f9b4911129b48ee45ff65869eb

diff --git a/src/Makefile b/src/Makefile
index 64408ed..f0733d4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,18 +3,22 @@ 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 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
+OBJ = log.o real.o bezier.o document.o objectrenderer.o view.o screen.o vfpu.o quadtree.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 -lgmp
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL -lgmp
+LIB_i686 = $(LIB_i386)
 
 MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
 MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
+MAINRPATH_i686 = $(MAINRPATH_i386)
 TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
 TESTRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32'
+TESTRPATH_i686 = $(TESTRPATH_i386)
 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_i686 := $(CFLAGS_i386)
 
 
 LIB := $(LIB_$(ARCH))
@@ -22,23 +26,24 @@ MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
-DEF = -DREAL=1
-
+REALTYPE=1
 LINKOBJ = $(OBJPATHS)
 
 RM = rm -f
 BIN = ../bin/ipdf
 
 
-all : DEF = -DREAL=1
+all : REAL = 1
 all : $(BIN)
 
-single : DEF = -DREAL=0
+single : REAL = 0
 single : $(BIN)
 
-double : DEF = -DREAL=1
+double : REAL = 1
 double : $(BIN)
 
+DEF = -DREAL=$(REALTYPE) -DQUADTREE_REMOVED
+
 demo : $(BIN) ../tools/stream_plot.py
 	mkdir -p ../data/
 	$(RM) ../data/performance.dat
@@ -54,7 +59,7 @@ movie : $(BIN) ../tools/stream_plot.py
 # 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)
+	$(CXX) $(CFLAGS) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH)
 
 -include $(DEPS)
 
@@ -65,7 +70,7 @@ runtests : tests/runtests.sh
 $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 	echo $(LINKOBJ)
 	@mkdir -p $(dir $@)
-	$(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
+	$(CXX) $(CFLAGS) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
 
 -include $(DEPS)
 
@@ -73,7 +78,7 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 	@mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
 
-../obj/%_asm.o : %_asm.s main.h
+../obj/%_asm.o : %_asm.S main.h
 	@mkdir -p $(dir $@)
 	$(CXX) -c -o $@ $<