mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-11 00:29:11 +01:00
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:
parent
2a3aa881fd
commit
10e625a11a
@ -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()))
|
||||
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user