X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=d7247ce83598b0430cc34fa3bc37ad9ec480f5d5;hp=e43b99c41a0aa7dfda0ec996c5b1fc49275ac85d;hb=8e8a5a3e29f4f5741cdbdf4e69dd966e5c89c05d;hpb=059877348c842e4d106e1d0231dffdcf47bb16d9 diff --git a/src/Makefile b/src/Makefile index e43b99c..d7247ce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,21 +4,25 @@ CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g MAIN = main.o OBJ = log.o document.o view.o screen.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