aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-12-07 10:11:47 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-12-07 10:11:47 +0000
commit9c400bd0bb618dd501f5dd3c836135413b19402a (patch)
tree894cf6c7e24337203b4d5d77cb76206e0d977b1e /Makefile
parent83ba70ef0b1ede415d7390a77dcd7cf3fb3d7af1 (diff)
downloadioquake3-aero-9c400bd0bb618dd501f5dd3c836135413b19402a.tar.gz
ioquake3-aero-9c400bd0bb618dd501f5dd3c836135413b19402a.zip
* (bug 3460) Revert OS X uname change
git-svn-id: svn://svn.icculus.org/quake3/trunk@1228 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 04009a2..91c4047 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,15 @@
COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
+COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/)
+
ifeq ($(COMPILE_PLATFORM),sunos)
# Solaris uname and GNU uname differ
- COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
-else
- COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
+ COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/)
+endif
+ifeq ($(COMPILE_PLATFORM),darwin)
+ # Apple does some things a little differently...
+ COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/)
endif
ifeq ($(COMPILE_PLATFORM),mingw32)