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

compile fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1799 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-05 23:30:44 +00:00
parent 790ee70b36
commit 25842deac5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/InputCommon/Src/EventHandler.cpp
View File

@ -20,11 +20,12 @@ EventHandler::~EventHandler() {
}
EventHandler *EventHandler::GetInstance() {
fprintf(stderr, "handler instance %p\n", m_Instance);
static EventHandler* m_Instance2 = 0;
fprintf(stderr, "handler instance %p\n", m_Instance2);
if (! m_Instance)
m_Instance = new EventHandler();
return m_Instance;
if (! m_Instance2)
m_Instance2 = new EventHandler();
return m_Instance2;
}
void EventHandler::Destroy() {

8
Source/Plugins/Plugin_nJoy_Testing/Src/SConscript
View File

@ -13,10 +13,10 @@ files = [
'nJoy.cpp',
]
if not env['HAVE_WX']
files.Append('GUI/AboutBox.cpp',
'GUI/ConfigBox.cpp',
)
if env['HAVE_WX']:
files +=[ 'GUI/AboutBox.cpp',
'GUI/ConfigBox.cpp',
]
padenv = env.Clone()
padenv.Append(