From: Sam Moore Date: Wed, 9 Apr 2014 08:10:27 +0000 (+0800) Subject: Use x86_64 when uname is broken X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=8e8a5a3e29f4f5741cdbdf4e69dd966e5c89c05d;p=ipdf%2Fcode.git Use x86_64 when uname is broken Wierd... >> sam@daedalus:~$ uname -i >> unknown >> sam@daedalus:~$ uname -a >> Linux daedalus 3.2.0-4-amd64 #1 SMP Debian 3.2.46-1 x86_64 GNU/Linux --- diff --git a/src/Makefile b/src/Makefile index 4874002..d7247ce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,6 +5,7 @@ MAIN = main.o OBJ = log.o document.o view.o screen.o LIB_x86_64 = ../contrib/lib/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_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32' TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib' @@ -13,12 +14,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` +CFLAGS_unknown = $(CFLAGS_x86_64) + LIB := $(LIB_$(ARCH)) MAINRPATH := $(MAINRPATH_$(ARCH)) TESTRPATH := $(TESTRPATH_$(ARCH)) CFLAGS := $(CFLAGS_$(ARCH)) + LINKOBJ = $(OBJPATHS) RM = rm -f