Real that uses Fast2Sum for addition

[ipdf/code.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index e43b99c..0b3be85 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,23 +1,29 @@
 #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_i686 = ../contrib/lib32/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_i686 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
+MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
 TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
-TESTRPATH_i686 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32'
+TESTRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32'
 OBJPATHS = $(OBJ:%=../obj/%)
 DEPS := $(OBJPATHS:%.o=%.d)
 CFLAGS_x86_64 := -I../contrib/include/SDL2 -I`pwd`
-CFLAGS_i686 := -I../contrib/include32/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)
 
@@ -27,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 [email protected] $(LINKOBJ) ../obj/[email protected] $(LIB) $(TESTRPATH)
 
@@ -40,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)