ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Soren Jorvang 2010-07-03 10:34:13 +00:00
parent 2a3aa881fd
commit 10e625a11a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputUICommon/Src/ConfigDiag.cpp
View File

@ -18,7 +18,7 @@
#include "ConfigDiag.h" #include "ConfigDiag.h"
#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) #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 // ToAscii was causing probs with some extended ascii characters, To8BitData seems to work
#define STR_FROM_WXSTR(w) (std::string((w).To8BitData())) #define STR_FROM_WXSTR(w) (std::string((w).To8BitData()))

13
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -16,13 +16,22 @@ files = [
'WiimoteEmu/EmuSubroutines.cpp', 'WiimoteEmu/EmuSubroutines.cpp',
'WiimoteEmu/Encryption.cpp', 'WiimoteEmu/Encryption.cpp',
'WiimoteEmu/Speaker.cpp', 'WiimoteEmu/Speaker.cpp',
'WiimoteReal/WiimoteReal.cpp',
'WiimoteNew.cpp', 'WiimoteNew.cpp',
'WiimoteConfigDiag.cpp', 'WiimoteConfigDiag.cpp',
] ]
libs = [ 'common', 'inputcommon', 'inputuicommon', 'SDL' ]
cxxflags = [ ]
if wiinewenv['HAVE_WIIUSE']:
cxxflags += [ '-DHAVE_WIIUSE' ]
files += [ "WiimoteReal/WiimoteReal.cpp" ]
libs += [ 'wiiuse' ]
wiinewenv.Append( wiinewenv.Append(
LIBS = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ], CXXFLAGS = cxxflags,
LIBS = libs
) )
wiinewenv.SharedLibrary(env['plugin_dir']+name, files) wiinewenv.SharedLibrary(env['plugin_dir']+name, files)