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

diff --git a/src/Makefile b/src/Makefile
index 805964e..fd0b81b 100644
--- 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=c++11 -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 graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o  path.o paranoidnumber.o quadtree.o debugscript.o
+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
@@ -41,7 +41,7 @@ DEF = -DREALTYPE=$(REALTYPE)
 ## Only link with things we care about
 
 ifeq ($(QUADTREE),enabled)
-	OBJ := $(OBJ)
+	OBJ := $(OBJ) quadtree.o
 else
 	DEF := $(DEF) -DQUADTREE_DISABLED
 endif
@@ -73,7 +73,9 @@ ifeq ($(REALTYPE),7)
 	CFLAGS :=  $(CFLAGS) -I../contrib/iRRAM/include
 endif
 
-
+ifeq ($(REALTYPE),8)
+	OBJ := $(OBJ) paranoidnumber.o
+endif 
 
 ifeq ($(REALTYPE),9)
 	LIB := $(LIB) -lgmp