[mupen64plus-ui-console] 17/172: Imported Upstream version 1.99.4~hg20100403

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit b175c3f32122b96b9166a592d6235fac72ff7d60
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Apr 4 21:42:41 2010 +0200

    Imported Upstream version 1.99.4~hg20100403
---
 doc/mupen64plus.6.gz       | Bin 2394 -> 2406 bytes
 projects/unix/Makefile     |  29 ++++++++++++++++++++---------
 src/compare_core.c         |   1 +
 src/main.c                 |   8 ++++----
 src/osal_dynamiclib_unix.c |   6 +++++-
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/doc/mupen64plus.6.gz b/doc/mupen64plus.6.gz
index de859a9..d0a1b87 100644
Binary files a/doc/mupen64plus.6.gz and b/doc/mupen64plus.6.gz differ
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 0bcae24..d7ca29c 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -35,8 +35,8 @@ endif
 ifeq ("$(UNAME)","FreeBSD")
   OS = FREEBSD
 endif
-ifeq ("$(UNAME)","GNU/kFreeBSD")
-  OS = FREEBSD
+ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
+  OS = LINUX
 endif
 ifeq ("$(OS)","NONE")
   $(error OS type "$(UNAME)" not supported.  Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
@@ -72,8 +72,8 @@ ifeq ("$(CPU)","NONE")
 endif
 
 # base CFLAGS, LIBS, and LDFLAGS
-CFLAGS = -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
-LDFLAGS = -ldl -lpthread
+CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
+LDFLAGS += -ldl -lpthread
 
 # set special flags per-system
 ifeq ($(OS), LINUX)
@@ -136,7 +136,6 @@ endif
 # set shell function names
 CC      ?= gcc
 CXX     ?= g++
-LD      ?= g++
 INSTALL ?= install
 ifeq ($(OS),OSX)
   STRIP	?= strip -x 
@@ -204,6 +203,7 @@ targets:
 	@echo "    COREDIR=path   == default path to search for Mupen64Plus Core (must end with slash)"
 	@echo "    PLUGINDIR=path == default path to search for plugins"
 	@echo "    SHAREDIR=path  == default path to search for shared data files"
+	@echo "    APIDIR=path    == path to find Mupen64Plus Core headers"
 	@echo "  Install Options:"
 	@echo "    PREFIX=path    == install/uninstall prefix (default: /usr/local/)"
 	@echo "    BINDIR=path    == path to install mupen64plus binary (default: PREFIX/bin/)"
@@ -216,6 +216,7 @@ all: $(TARGET)
 
 clean:
 	rm -rf ./_obj/* $(TARGET)
+	rmdir ./_obj
 
 rebuild: clean all
 
@@ -228,12 +229,22 @@ install: $(TARGET)
 uninstall:
 	rm -f "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/mupen64plus.6.gz"
 
+# build dependency files
+CFLAGS += -MD
+-include $(OBJECTS:.o=.d)
+
+# reduced compile output when running make without V=1
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifndef V
+	Q_CC  = @echo '    CC  '$@;
+	Q_LD  = @echo '    LD  '$@;
+endif
+endif
+
 # build rules
 $(TARGET): $(OBJECTS)
-	$(CC) $^ $(LDFLAGS) $(SRC_LIBS) -o $@
+	$(Q_LD)$(CC) $^ $(LDFLAGS) $(SRC_LIBS) -o $@
 	$(STRIP) $@
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.c
-	$(CC) -o $@ $(CFLAGS) -c $<
-
-
+	$(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
diff --git a/src/compare_core.c b/src/compare_core.c
index b869001..b525e61 100644
--- a/src/compare_core.c
+++ b/src/compare_core.c
@@ -21,6 +21,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/stat.h>
 
 #include "m64p_types.h"
diff --git a/src/main.c b/src/main.c
index b6c0bfa..e61b35a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -138,10 +138,10 @@ static m64p_error OpenConfigurationHandles(void)
 
     /* Set default values for my Config parameters */
     (*ConfigSetDefaultString)(l_ConfigUI, "PluginDir", OSAL_CURRENT_DIR, "Directory in which to search for plugins");
-    (*ConfigSetDefaultString)(l_ConfigUI, "VideoPlugin", "m64p_video_rice" OSAL_DLL_EXTENSION, "Filename of video plugin");
-    (*ConfigSetDefaultString)(l_ConfigUI, "AudioPlugin", "m64p_audio_jttl" OSAL_DLL_EXTENSION, "Filename of audio plugin");
-    (*ConfigSetDefaultString)(l_ConfigUI, "InputPlugin", "m64p_input_blight" OSAL_DLL_EXTENSION, "Filename of input plugin");
-    (*ConfigSetDefaultString)(l_ConfigUI, "RspPlugin", "m64p_rsp_hle" OSAL_DLL_EXTENSION, "Filename of RSP plugin");
+    (*ConfigSetDefaultString)(l_ConfigUI, "VideoPlugin", "mupen64plus-video-rice" OSAL_DLL_EXTENSION, "Filename of video plugin");
+    (*ConfigSetDefaultString)(l_ConfigUI, "AudioPlugin", "mupen64plus-audio-sdl" OSAL_DLL_EXTENSION, "Filename of audio plugin");
+    (*ConfigSetDefaultString)(l_ConfigUI, "InputPlugin", "mupen64plus-input-sdl" OSAL_DLL_EXTENSION, "Filename of input plugin");
+    (*ConfigSetDefaultString)(l_ConfigUI, "RspPlugin", "mupen64plus-rsp-hle" OSAL_DLL_EXTENSION, "Filename of RSP plugin");
 
     return M64ERR_SUCCESS;
 }
diff --git a/src/osal_dynamiclib_unix.c b/src/osal_dynamiclib_unix.c
index 18bdd13..67eea2b 100644
--- a/src/osal_dynamiclib_unix.c
+++ b/src/osal_dynamiclib_unix.c
@@ -20,6 +20,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 #include <dlfcn.h>
 
@@ -35,7 +36,10 @@ m64p_error osal_dynlib_open(m64p_dynlib_handle *pLibHandle, const char *pccLibra
 
     if (*pLibHandle == NULL)
     {
-        fprintf(stderr, "dlopen('%s') error: %s\n", pccLibraryPath, dlerror());
+        /* only print an error message if there is a directory separator (/) in the pathname */
+        /* this prevents us from throwing an error for the use case where Mupen64Plus is not installed */
+        if (strchr(pccLibraryPath, '/') != NULL)
+            fprintf(stderr, "dlopen('%s') error: %s\n", pccLibraryPath, dlerror());
         return M64ERR_INPUT_NOT_FOUND;
     }
 

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