Animation of precision_vs_zoom

[ipdf/code.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 2b5fc73..30fa7a9 100644 (file)
--- 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=gnu++0x -g -Wall -Werror -Wshadow -pedantic -rdynamic
+CXX = g++ -std=c++11 -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
+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
 
 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) quadtree.o
+       OBJ := $(OBJ)
 else
        DEF := $(DEF) -DQUADTREE_DISABLED
 endif
@@ -104,7 +104,7 @@ movie : $(BIN) ../tools/stream_plot.py
 # 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) $(CFLAGS) -o $@.test $(LINKOBJ) ../obj/[email protected] $(LIB) $(TESTRPATH)
+       $(CXX) $(CFLAGS) -o $@ $(LINKOBJ) ../obj/[email protected] $(LIB) $(TESTRPATH)
 
 -include $(DEPS)