X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FMakefile;h=5d3ae00c8cb90d9415295f0d07b737effe79917f;hb=79d61ba24ac2d29cea6e7f1fee2f83705c5fb4ac;hp=e43b99c41a0aa7dfda0ec996c5b1fc49275ac85d;hpb=059877348c842e4d106e1d0231dffdcf47bb16d9;p=ipdf%2Fcode.git

diff --git a/src/Makefile b/src/Makefile
index e43b99c..5d3ae00 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,23 +2,27 @@
 ARCH := $(shell uname -i)
 CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
 MAIN = main.o
-OBJ = log.o document.o view.o screen.o
+OBJ = log.o document.o view.o screen.o vfpu.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
+LIB_unknown = $(LIB_x86_64)
 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`
+CFLAGS_unknown = $(CFLAGS_x86_64)
+
 LIB := $(LIB_$(ARCH))
 MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
 
+
 LINKOBJ = $(OBJPATHS)
 
 RM = rm -f