[mupen64plus-ui-console] 105/172: Imported Upstream version 1.99.5+3+19265d7e8658

[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 dd63990246273742a03c34a9cae6150679a62cf6
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jun 16 22:13:15 2012 +0200

    Imported Upstream version 1.99.5+3+19265d7e8658
---
 projects/unix/Makefile | 6 ++++++
 src/main.c             | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index c747910..6c46a76 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -236,6 +236,7 @@ targets:
 	@echo "    DESTDIR=path   == path to prepend to all installation paths (only for packagers)"
 	@echo "  Debugging Options:"
 	@echo "    DEBUG=1        == add debugging symbols to application binary"
+	@echo "    LTO=1         == enable experimental build with link-time optimization"
 	@echo "    V=1            == show verbose compiler output"
 
 all: $(TARGET)
@@ -258,6 +259,11 @@ uninstall:
 CFLAGS += -MD
 -include $(OBJECTS:.o=.d)
 
+ifeq ($(LTO), 1)
+  CFLAGS += -flto
+  LDFLAGS += -fuse-linker-plugin -fwhole-program $(CFLAGS)
+endif
+
 # standard build rules
 $(OBJDIR)/%.o: $(SRCDIR)/%.c
 	$(COMPILE.c) -o $@ $<
diff --git a/src/main.c b/src/main.c
index 0568deb..d7191da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -164,7 +164,7 @@ static m64p_error OpenConfigurationHandles(void)
     }
 
     /* Set default values for my Config parameters */
-    (*ConfigSetDefaultFloat)(l_ConfigUI, "Version", CONFIG_PARAM_VERSION,  "Mupen64Plus UI-Console config parameter set version number.  Please don't change");
+    (*ConfigSetDefaultFloat)(l_ConfigUI, "Version", CONFIG_PARAM_VERSION,  "Mupen64Plus UI-Console config parameter set version number.  Please don't change this version number.");
     (*ConfigSetDefaultString)(l_ConfigUI, "PluginDir", OSAL_CURRENT_DIR, "Directory in which to search for plugins");
     (*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");

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