[mupen64plus-video-z64] 105/161: Imported Upstream version 1.99.5+4+ee66eddb472a

[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-video-z64.

commit 90b477f77efe52dd4c245ff29b3e1a3064100a76
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Dec 2 22:03:39 2012 +0100

    Imported Upstream version 1.99.5+4+ee66eddb472a
---
 .hg_archival.txt       |  5 -----
 .hgignore              |  4 ----
 .hgtags                |  2 --
 projects/unix/Makefile | 13 +++++++++++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
deleted file mode 100644
index 28d9aba..0000000
--- a/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: 29d6a3861712003358cf3187f7a9736a9f243756
-node: 083703f91ceaa11ef7ded2cd9f695cc4aa667e1a
-branch: default
-latesttag: 1.99.5
-latesttagdistance: 1
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 495a970..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,4 +0,0 @@
-syntax: regexp
-
-^projects/unix/_obj/
-^projects/unix/mupen64plus-video-z64.so$
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index 6e5ca20..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,2 +0,0 @@
-ce1efa043f54c7421e2ee8b95f5c53ea702746c5 1.99.4
-3d6f55e4531cb4f883bca555fea1a1e066d91f82 1.99.5
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index edf32c5..105c07c 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -83,7 +83,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
@@ -99,6 +99,15 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
   NO_ASM := 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
+    NO_ASM := 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
@@ -307,7 +316,7 @@ all: $(TARGET)
 
 install: $(TARGET)
 	$(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)"
-	$(INSTALL) -m 0644 $(TARGET) $(INSTALL_STRIP_FLAG) "$(DESTDIR)$(PLUGINDIR)"
+	$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)"
 	$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
 
 uninstall:

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