[mupen64plus-rsp-z64] 99/140: Imported Upstream version 1.99.5+3+ee940659ff77

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-rsp-z64.

commit 65fb8b6764405b7da12b2cc0cb68cb561be190d4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Dec 2 21:54:24 2012 +0100

    Imported Upstream version 1.99.5+3+ee940659ff77
---
 .hg_archival.txt       |  5 -----
 .hgignore              |  4 ----
 .hgtags                |  2 --
 projects/unix/Makefile | 10 +++++++++-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
deleted file mode 100644
index da0aa67..0000000
--- a/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: f788ddc2d4711f6ac1125c99e9e4c5ebd3827ea7
-node: 816e5ec02d58c71a05441b74b77beeec79f81bb5
-branch: default
-latesttag: 1.99.5
-latesttagdistance: 1
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index b93dc89..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,4 +0,0 @@
-syntax: regexp
-
-^projects/unix/_obj/
-^projects/unix/mupen64plus-rsp-z64.so$
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index 71797af..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,2 +0,0 @@
-0990ff8d7dcc61cd88e049c91eeaedb0bfbe70d7 1.99.4
-04507d8b67d1817deacdf4f0ca05a6b16af02f10 1.99.5
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 3b12d58..7063d1b 100755
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -84,7 +84,7 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
   ARCH_DETECTED := 32BITS
   PIC ?= 0
 endif
-ifneq ("$(filter ppc powerpc,$(HOST_CPU))","")
+ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","")
   CPU := PPC
   ARCH_DETECTED := 32BITS
   BIG_ENDIAN := 1
@@ -98,6 +98,14 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
   PIC ?= 1
   $(warning Architecture "$(HOST_CPU)" not officially supported.')
 endif
+ifneq ("$(filter arm%,$(HOST_CPU))","")
+  ifeq ("$(filter arm%b,$(HOST_CPU))","")
+    CPU := ARM
+    ARCH_DETECTED := 32BITS
+    PIC ?= 1
+    $(warning Architecture "$(HOST_CPU)" not officially supported.')
+  endif
+endif
 ifeq ("$(CPU)","NONE")
   $(error CPU type "$(HOST_CPU)" not supported.  Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-z64.git