From 10e625a11a23a8fb7397dec3412d64cb95d7a8ce Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 3 Jul 2010 10:34:13 +0000 Subject: [PATCH] PluginWiimoteNew now needs libwiiuse. Treat external data (configuration file and device names) as 8-bit data. Character set mapping is not ideal, but at least such names can be used. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5824 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputUICommon/Src/ConfigDiag.cpp | 2 +- Source/Plugins/Plugin_WiimoteNew/Src/SConscript | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp index 3ecdb8ed22..7d0446e9e7 100644 --- a/Source/Core/InputUICommon/Src/ConfigDiag.cpp +++ b/Source/Core/InputUICommon/Src/ConfigDiag.cpp @@ -18,7 +18,7 @@ #include "ConfigDiag.h" #define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) -#define WXSTR_FROM_STR(s) (wxString::FromAscii((s).c_str())) +#define WXSTR_FROM_STR(s) (wxString::From8BitData((s).c_str())) // ToAscii was causing probs with some extended ascii characters, To8BitData seems to work #define STR_FROM_WXSTR(w) (std::string((w).To8BitData())) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript index 0149a40d6a..024706d248 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript +++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript @@ -16,13 +16,22 @@ files = [ 'WiimoteEmu/EmuSubroutines.cpp', 'WiimoteEmu/Encryption.cpp', 'WiimoteEmu/Speaker.cpp', - 'WiimoteReal/WiimoteReal.cpp', 'WiimoteNew.cpp', 'WiimoteConfigDiag.cpp', ] +libs = [ 'common', 'inputcommon', 'inputuicommon', 'SDL' ] + +cxxflags = [ ] + +if wiinewenv['HAVE_WIIUSE']: + cxxflags += [ '-DHAVE_WIIUSE' ] + files += [ "WiimoteReal/WiimoteReal.cpp" ] + libs += [ 'wiiuse' ] + wiinewenv.Append( - LIBS = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ], + CXXFLAGS = cxxflags, + LIBS = libs ) wiinewenv.SharedLibrary(env['plugin_dir']+name, files)