X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=95ff5be0f8576d057458fbf8fbc4312f5bf3c35f;hp=4874002223ffe54377997fc691a597b188e4ded6;hb=b8c16a21a8f59ff8cde6bb546cc44a6fc422c2b7;hpb=a6935331331de7f1d48b49bd688963039078e390 diff --git a/src/Makefile b/src/Makefile index 4874002..95ff5be 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,10 +1,13 @@ #Makefile -ARCH := $(shell uname -i) -CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g +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 MAIN = main.o -OBJ = log.o document.o view.o screen.o +OBJ = log.o real.o document.o view.o screen.o vfpu.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL + MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib' MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32' TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib' @@ -13,11 +16,14 @@ OBJPATHS = $(OBJ:%=../obj/%) DEPS := $(OBJPATHS:%.o=%.d) CFLAGS_x86_64 := -I../contrib/include/SDL2 -I`pwd` CFLAGS_i386 := -I../contrib/include32/SDL2 -I`pwd` + + LIB := $(LIB_$(ARCH)) MAINRPATH := $(MAINRPATH_$(ARCH)) TESTRPATH := $(TESTRPATH_$(ARCH)) CFLAGS := $(CFLAGS_$(ARCH)) +DEF = -DREAL=1 LINKOBJ = $(OBJPATHS) @@ -25,22 +31,37 @@ RM = rm -f BIN = ../bin/ipdf + all : $(BIN) +single : DEF = -DREAL=0 +single : $(BIN) + +double : DEF = -DREAL=1 +double : $(BIN) + +# The tests will compile with the default REAL definition +# To change that you can run as `make DEFS="REAL=X" tests/` 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) +-include $(DEPS) + runtests : tests/runtests.sh cd tests; ./runtests.sh $(BIN) : $(LINKOBJ) ../obj/$(MAIN) + echo $(LINKOBJ) @mkdir -p $(dir $@) $(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH) +-include $(DEPS) + ../obj/%.o : %.cpp @mkdir -p $(dir $@) - $(CXX) $(CFLAGS) -c -MMD -o $@ $< + $(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $< -include $(DEPS)