[mupen64plus-rsp-z64] 128/140: Imported Upstream version 2.0.0+9+g93dc84f

[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 b4d4622e373b8bb83b8a99dc9183ba2468afbb84
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 5 11:19:58 2014 +0200

    Imported Upstream version 2.0.0+9+g93dc84f
---
 .gitattributes         | 38 ++++++++++++++++++++++++++++++++++++++
 .gitignore             |  2 ++
 .hg_archival.txt       |  5 -----
 .hgignore              |  4 ----
 .hgtags                |  3 ---
 .travis.yml            | 13 +++++++++++++
 projects/unix/Makefile |  4 ++--
 src/main_rsp.cpp       | 12 +++++++++++-
 8 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f053771
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,38 @@
+* text=auto
+
+# normal text files
+*.6 text
+AUTHORS text
+*.c text
+*.cfg text
+*.cht text
+*.conf text
+COPYING text
+*.cpp text
+*.def text
+*-license text
+*.h text
+*.html text
+*.ini text
+INSTALL text
+LICENSES text
+Makefile text
+*.py text
+README text
+RELEASE text
+*.S text
+*.sh text
+*.txt text
+*.ver text
+
+# windows specific text files
+*.sln text eol=crlf
+*.vcproj text eol=crlf
+*.vcxproj text eol=crlf
+*.vcxproj.filters text eol=crlf
+
+# binary files
+*.gz binary
+*.ttf binary
+cursor.tex binary
+font.tex binary
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f8d46d2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/projects/unix/_obj*/
+/projects/unix/mupen64plus-rsp-z64*.so
diff --git a/.hg_archival.txt b/.hg_archival.txt
deleted file mode 100644
index a9ef836..0000000
--- a/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: f788ddc2d4711f6ac1125c99e9e4c5ebd3827ea7
-node: c44d274a4c4ab80d4b88353c045a78273ee76915
-branch: default
-latesttag: 2.0.0
-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 2bfd467..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,3 +0,0 @@
-0990ff8d7dcc61cd88e049c91eeaedb0bfbe70d7 1.99.4
-04507d8b67d1817deacdf4f0ca05a6b16af02f10 1.99.5
-3f5658dd8b57d4f1414a7ab858986c2589253590 2.0.0
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..2ed1bbf
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y git
+  - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
+env:
+ - HLEVIDEO=0
+ - HLEVIDEO=1
+script:
+ - make -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 clean && CPPFLAGS="-D__extern_always_inline=inline" LDFLAGS="-Wl,--no-add-needed -Wl,--no-undefined" OPTFLAGS="-O2" make CC="${CC}" CXX="${CXX}" -j$(nproc) -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/" V=1 all
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index bf777a3..62e2e43 100755
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -1,6 +1,6 @@
 #/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 # *   mupen64plus-rsp-z64 - Makefile                                        *
-# *   http://bitbucket.org/wahrhaft/mupen64plus-rsp-z64/                    *
+# *   https://github.com/mupen64plus/mupen64plus-rsp-z64/                   *
 # *   Copyright (C) 2010 Jon Ring                                           *
 # *   Copyright (C) 2008-2009 Richard Goedeken                              *
 # *   Copyright (C) 2007-2008 DarkJeztr Tillin9                             *
@@ -302,7 +302,7 @@ clean:
 rebuild: clean all
 
 # build dependency files
-CFLAGS += -MD
+CFLAGS += -MD -MP
 -include $(OBJECTS:.o=.d)
 
 CXXFLAGS += $(CFLAGS)
diff --git a/src/main_rsp.cpp b/src/main_rsp.cpp
index c6bcf50..4f2b8c5 100644
--- a/src/main_rsp.cpp
+++ b/src/main_rsp.cpp
@@ -26,6 +26,16 @@
 #define RSP_Z64_VERSION        0x020000
 #define RSP_PLUGIN_API_VERSION 0x020000
 
+#if defined(VIDEO_HLE_ALLOWED) && defined(AUDIO_HLE_ALLOWED)
+#define L_NAME "Z64 RSP Plugin (HLE)"
+#elif defined(VIDEO_HLE_ALLOWED)
+#define L_NAME "Z64 RSP Plugin (MLE)"
+#elif defined(AUDIO_HLE_ALLOWED)
+#define L_NAME "Z64 RSP Plugin (LLE)"
+#else
+#define L_NAME "Z64 RSP Plugin"
+#endif
+
 static void (*l_DebugCallback)(void *, int, const char *) = NULL;
 static void *l_DebugCallContext = NULL;
 static bool l_PluginInit = false;
@@ -123,7 +133,7 @@ extern "C" {
             *APIVersion = RSP_PLUGIN_API_VERSION;
 
         if (PluginNamePtr != NULL)
-            *PluginNamePtr = "Z64 RSP Plugin";
+            *PluginNamePtr = L_NAME;
 
         if (Capabilities != NULL)
         {

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