X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=fd0b81b78dc21df4c0aea127a07e964972aec596;hp=ec8789ace3a368d5884f65df73a485ec532bbaf7;hb=326f04a375ce3120f7e8957e3d7cd5f296f513e3;hpb=39599aa6423d3e0181fbfe2aac8f78f388a3f372

diff --git a/src/Makefile b/src/Makefile
index ec8789a..fd0b81b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,20 +1,29 @@
 #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 -rdynamic
+CXX = g++ -std=c++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
-LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
-LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
+OBJ = log.o real.o bezier.o objectrenderer.o view.o screen.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o  path.o document.o debugscript.o
+
+QT_INCLUDE := -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -Itests -I.
+QT_DEF := -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+QT_LIB :=  -L/usr/lib/x86_64-linux-gnu -lQtGui -lQtCore -lpthread 
+
+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 +31,72 @@ MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
-DEF = -DREAL=1
-
-LINKOBJ = $(OBJPATHS)
-
 RM = rm -f
 BIN = ../bin/ipdf
+REALTYPE=1
+CONTROLPANEL=enabled
+QUADTREE=disabled
+DEF = -DREALTYPE=$(REALTYPE) 
+
+## Only link with things we care about
+
+ifeq ($(QUADTREE),enabled)
+	OBJ := $(OBJ) quadtree.o
+else
+	DEF := $(DEF) -DQUADTREE_DISABLED
+endif
+
+ifeq ($(CONTROLPANEL),enabled)
+	LIB := $(LIB) $(QT_LIB)
+	DEF := $(DEF) $(QT_DEF)
+	CFLAGS := $(CFLAGS) $(QT_INCLUDE)
+	OBJ := $(OBJ) moc_controlpanel.o controlpanel.o
+else
+	DEF := $(DEF) -DCONTROLPANEL_DISABLED
+endif
+
+ifeq ($REALTYPE),3)
+	OBJ := $(OBJ) vfpu.o
+endif
+
+ifeq ($(REALTYPE),5)
+	OBJ := $(OBJ) add_digits_asm.o sub_digits_asm.o mul_digits_asm.o div_digits_asm.o arbint.o
+	LIB := $(LIB) -lgmp
+endif
+
+ifeq ($(REALTYPE),6)
+	LIB := $(LIB) -lgmp -lmpfr
+endif
+
+ifeq ($(REALTYPE),7)
+	LIB := $(LIB) -L../contrib/iRRAM/lib -liRRAM -lgmp -lmpfr
+	CFLAGS :=  $(CFLAGS) -I../contrib/iRRAM/include
+endif
+
+ifeq ($(REALTYPE),8)
+	OBJ := $(OBJ) paranoidnumber.o
+endif 
+
+ifeq ($(REALTYPE),9)
+	LIB := $(LIB) -lgmp
+endif
 
+LINKOBJ = $(OBJPATHS)
 
-all : DEF = -DREAL=1
+
+all : REALTYPE = 1
 all : $(BIN)
 
-single : DEF = -DREAL=0
+single : REALTYPE = 0
 single : $(BIN)
 
-double : DEF = -DREAL=1
+double : REALTYPE = 1
 double : $(BIN)
 
+
+
+CFLAGS := $(CFLAGS) $(QT_DEF)
+
 demo : $(BIN) ../tools/stream_plot.py
 	mkdir -p ../data/
 	$(RM) ../data/performance.dat
@@ -50,11 +108,11 @@ movie : $(BIN) ../tools/stream_plot.py
 	$(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
+# The tests will compile with the default REALTYPE definition
+# To change that you can run as `make DEFS="REALTYPE=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 $@ $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH)
 
 -include $(DEPS)
 
@@ -65,15 +123,18 @@ 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)
 
+moc_controlpanel.cpp : controlpanel.cpp controlpanel.h
+	moc-qt4 $(DEF) controlpanel.h -o moc_controlpanel.cpp
+
 ../obj/%.o : %.cpp main.h
 	@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 $@ $<