X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=0b3be8535df1b66834cc2b42f7937f6e8c952fd4;hp=d7247ce83598b0430cc34fa3bc37ad9ec480f5d5;hb=5e19040b00e135ead52e535165e079ee72059727;hpb=8e8a5a3e29f4f5741cdbdf4e69dd966e5c89c05d

diff --git a/src/Makefile b/src/Makefile
index d7247ce..0b3be85 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +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 stb_truetype.o
 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
-LIB_unknown = $(LIB_x86_64)
+
 MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
 MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
 TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
@@ -14,14 +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`
-CFLAGS_unknown = $(CFLAGS_x86_64)
+
 
 LIB := $(LIB_$(ARCH))
 MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
-
+DEF = -DREAL=1
 
 LINKOBJ = $(OBJPATHS)
 
@@ -31,6 +33,15 @@ 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/<target>` 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)
 
@@ -44,7 +55,7 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 
 ../obj/%.o : %.cpp
 	@mkdir -p $(dir $@)
-	$(CXX) $(CFLAGS) -c -MMD -o $@ $<
+	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
 
 -include $(DEPS)