X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FMakefile;h=03cf3aa115aba214f830742ab4a604312d891ccb;hb=6ce000e7212d9f5db6e5998c41df15bcad2022c8;hp=668f0a91d867ca4a4b6b19eb0e249feca15e44d6;hpb=888817a67a9d840be66b52811b01eb77f10ff3e6;p=ipdf%2Fcode.git diff --git a/src/Makefile b/src/Makefile index 668f0a9..03cf3aa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ #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 quadtree.o @@ -104,7 +104,7 @@ movie : $(BIN) ../tools/stream_plot.py # To change that you can run as `make DEFS="REALTYPE=X" tests/` 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/$@.o $(LIB) $(TESTRPATH) + $(CXX) $(CFLAGS) -o $@ $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH) -include $(DEPS)