[mupen64plus-video-arachnoid] 99/147: Imported Upstream version 1.99.5+4+28e9cf4a672f

[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-arachnoid.

commit ae02045e20bbb8f4c1077d7e4303c043be732855
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Dec 2 21:57:35 2012 +0100

    Imported Upstream version 1.99.5+4+28e9cf4a672f
---
 .hg_archival.txt                     |  5 -----
 .hgignore                            |  4 ----
 .hgtags                              |  2 --
 projects/unix/Makefile               | 10 +++++++++-
 src/Combiner/CombinerStageCreator.h  |  2 +-
 src/ExtensionChecker.h               |  2 +-
 src/ucodes/UCode1.h                  |  2 +-
 src/ucodes/UCode10.h                 |  2 +-
 src/ucodes/UCode4.h                  |  2 +-
 src/ucodes/UCode7.h                  |  2 +-
 src/ucodes/UCodeIdentificationData.h |  2 +-
 11 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
deleted file mode 100644
index 3d52b06..0000000
--- a/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: 976896f303442924a04de6fb0725b98269a9bbe3
-node: fdf691ffdedadb6605aab235cd4c593bcb9977f8
-branch: default
-latesttag: 1.99.5
-latesttagdistance: 1
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 8f52e27..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,4 +0,0 @@
-syntax: regexp
-
-^projects/unix/_obj/
-^projects/unix/mupen64plus-video-arachnoid.so$
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index 77abdaf..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,2 +0,0 @@
-7713c313dc69e551761636645e9ad94d2e3a93c6 1.99.4
-567e98c190507a3818bf851ecb2b5de600de7896 1.99.5
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index d6f73a1..d53763e 100755
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -76,7 +76,7 @@ ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
   CPU := X86
   ARCH_DETECTED := 32BITS
 endif
-ifneq ("$(filter ppc powerpc,$(HOST_CPU))","")
+ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU))","")
   CPU := PPC
   ARCH_DETECTED := 32BITS
   BIG_ENDIAN := 1
@@ -90,6 +90,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
 
 # base CFLAGS, LDLIBS, and LDFLAGS
 OPTFLAGS ?= -O3
diff --git a/src/Combiner/CombinerStageCreator.h b/src/Combiner/CombinerStageCreator.h
index a6b084e..c2e44aa 100755
--- a/src/Combiner/CombinerStageCreator.h
+++ b/src/Combiner/CombinerStageCreator.h
@@ -27,4 +27,4 @@
 //Function used to set combiner stage
 void setStage(CombineCycle* combineCycle, CombinerStage* stageOut);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ExtensionChecker.h b/src/ExtensionChecker.h
index e7f9ec4..3623066 100755
--- a/src/ExtensionChecker.h
+++ b/src/ExtensionChecker.h
@@ -24,4 +24,4 @@
 
 bool isExtensionSupported( const char *extension );
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ucodes/UCode1.h b/src/ucodes/UCode1.h
index 5ab6c3d..2b4087f 100755
--- a/src/ucodes/UCode1.h
+++ b/src/ucodes/UCode1.h
@@ -105,4 +105,4 @@ private:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ucodes/UCode10.h b/src/ucodes/UCode10.h
index 919832e..dddd61d 100755
--- a/src/ucodes/UCode10.h
+++ b/src/ucodes/UCode10.h
@@ -62,4 +62,4 @@ private:
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ucodes/UCode4.h b/src/ucodes/UCode4.h
index 04a0384..4c9eb6e 100755
--- a/src/ucodes/UCode4.h
+++ b/src/ucodes/UCode4.h
@@ -56,4 +56,4 @@ private:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ucodes/UCode7.h b/src/ucodes/UCode7.h
index cf8234f..5565591 100755
--- a/src/ucodes/UCode7.h
+++ b/src/ucodes/UCode7.h
@@ -62,4 +62,4 @@ private:
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/ucodes/UCodeIdentificationData.h b/src/ucodes/UCodeIdentificationData.h
index 76ec593..802a247 100755
--- a/src/ucodes/UCodeIdentificationData.h
+++ b/src/ucodes/UCodeIdentificationData.h
@@ -52,4 +52,4 @@ struct UcodeData
     bool         reject;         //!< 
 };
 
-#endif
\ No newline at end of file
+#endif

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