X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=f3c287c22ce374dd49ee242bf28e3b655f9daa26;hp=4874002223ffe54377997fc691a597b188e4ded6;hb=700f1449af19115ff2bbe50ad67ea7c73f9aa5cd;hpb=a6935331331de7f1d48b49bd688963039078e390

diff --git a/src/Makefile b/src/Makefile
index 4874002..f3c287c 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 document.o view.o screen.o vfpu.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
+
 MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
 MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
 TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
@@ -13,12 +16,15 @@ 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))
 
 
+
 LINKOBJ = $(OBJPATHS)
 
 RM = rm -f