X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FMakefile;h=23930b60bcf76503de3599e688e985edc164e308;hb=80c609660b049d1bf62d98acfb0c1aa893278123;hp=dba3b2a5ee6be1a8e4ebc08ad0529c7efc939f8b;hpb=5f600e9c0d22c09bd60ef3c7245dbecc8d35d576;p=ipdf%2Fcode.git

diff --git a/src/Makefile b/src/Makefile
index dba3b2a..23930b6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,16 +1,16 @@
 #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
+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
-LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL 
+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'
@@ -36,12 +36,14 @@ BIN = ../bin/ipdf
 REALTYPE=1
 CONTROLPANEL=enabled
 QUADTREE=disabled
-DEF = -DREALTYPE=$(REALTYPE) 
+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 +75,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