[wxmupen64plus] 64/71: Imported Upstream version 0.3+20+f3a10d673ec5

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.

commit 1411d78f822eee3a836884182043363465f82084
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Oct 20 15:40:34 2012 +0200

    Imported Upstream version 0.3+20+f3a10d673ec5
---
 main.cpp                       | 2 +-
 mupen64plusplus/MupenAPIpp.cpp | 8 ++++++++
 wscript                        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/main.cpp b/main.cpp
index a7029d3..0de11f0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -183,7 +183,7 @@ bool MupenFrontendApp::OnInit()
               (const char*)datadir.utf8_str(), (const char*)libs.utf8_str());
     int plugins = 0;
     
-    wxString corepath = libs + "libmupen64plus" + OSAL_DLL_EXTENSION;
+    wxString corepath = libs + OSAL_DEFAULT_DYNLIB_FILENAME; //"libmupen64plus" + OSAL_DLL_EXTENSION;
     
     while (m_api == NULL)
     {
diff --git a/mupen64plusplus/MupenAPIpp.cpp b/mupen64plusplus/MupenAPIpp.cpp
index 18e5105..61f6bbb 100644
--- a/mupen64plusplus/MupenAPIpp.cpp
+++ b/mupen64plusplus/MupenAPIpp.cpp
@@ -1006,6 +1006,14 @@ std::string ConfigParam::getStringValue()
         errmsg = errmsg + getErrorMessage(result);
         throw std::runtime_error(errmsg);
     }
+    
+    // HACK: when the name of a device is 'AutoKeyboard', mupen will not reload
+    //       the config. Since wxmupen is all about changing the config, don't
+    //       let mupen do that :)
+    if (m_param_name == "name" and std::string(buffer) == "AutoKeyboard")
+    {
+        return "CustomKeyboardConfig";
+    }
 
     return std::string(buffer);
 }
diff --git a/wscript b/wscript
index 7ad52a5..70271b4 100644
--- a/wscript
+++ b/wscript
@@ -99,7 +99,7 @@ def configure(ctx):
     ctx.check_cc(header_name="m64p_config.h",     includes=[api_path])
     ctx.check_cc(header_name="m64p_types.h",      includes=[api_path])
     if version_check:
-	ctx.check_cc(header_name="../main/version.h", includes=[api_path])
+        ctx.check_cc(header_name="../main/version.h", includes=[api_path])
 
     ctx.check_cfg(path=sdl_config, args='--cflags --libs',   package='', uselib_store='SDL')
     

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