X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=f3c287c22ce374dd49ee242bf28e3b655f9daa26;hp=7620e21b09cd92d3d2e9f6e44d591335103c6666;hb=6ad7439e8ebf969fcd2d3a710a4b16e2b1ee131f;hpb=26524b787a61cb6d8bb5f2f6925855768ac9471f

diff --git a/src/Makefile b/src/Makefile
index 7620e21..f3c287c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,13 +1,29 @@
 #Makefile
-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
-LIB = ../contrib/lib/libSDL2-2.0.so.0 -lGL
-MAINRPATH = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
-TESTRPATH = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
+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'
+TESTRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32'
 OBJPATHS = $(OBJ:%=../obj/%)
 DEPS := $(OBJPATHS:%.o=%.d)
-CFLAGS += -I../contrib/include/SDL2 -I`pwd`
+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)