From 01da5067ff0430490ce94b6ed1c3f663b4b89e95 Mon Sep 17 00:00:00 2001 From: Sam Moore Date: Tue, 15 Apr 2014 00:29:51 +0800 Subject: [PATCH] Actual fix for when `uname -i` doesn't work Just use `uname -m` --- src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 5d3ae00..c788f85 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,11 +1,11 @@ #Makefile -ARCH := $(shell uname -i) +ARCH := $(shell uname -m) CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g MAIN = main.o OBJ = log.o document.o view.o screen.o vfpu.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' @@ -14,7 +14,7 @@ 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)) -- 2.20.1