darkkirb/buildtools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use uname -m to determine architecture.

Browse source
This commit is contained in:
Steven Smith 2016-05-31 13:16:42 -07:00
parent d84c344339
commit 55207e874c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
make_base
View file

@ -113,8 +113,8 @@ ifeq ($(TARGET),3DS)
else else
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
UNAME_P := $(shell uname -p) UNAME_M := $(shell uname -m)
ifeq ($(UNAME_P),x86_64) ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 amd64))
MAKEROM := $(BUILDTOOLS_DIR)/3ds/makerom-linux64 MAKEROM := $(BUILDTOOLS_DIR)/3ds/makerom-linux64
BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-linux64 BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-linux64
CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-linux64 CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-linux64
@ -123,8 +123,7 @@ ifeq ($(TARGET),3DS)
BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-linux32 BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-linux32
CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-linux32 CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-linux32
endif endif
endif else ifeq ($(UNAME_S),Darwin)
ifeq ($(UNAME_S),Darwin)
MAKEROM := $(BUILDTOOLS_DIR)/3ds/makerom-mac MAKEROM := $(BUILDTOOLS_DIR)/3ds/makerom-mac
BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-mac BANNERTOOL := $(BUILDTOOLS_DIR)/3ds/bannertool-mac
CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-mac CITRA := $(BUILDTOOLS_DIR)/3ds/citra/citra-mac