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

Fix the nowx build. Do we still want to keep the nowx build? If you do speak up now because soren wants to remove it. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5851 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-07-08 00:52:46 +00:00
parent 0cdfef4056
commit 75be9ce40d
7 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -379,7 +379,6 @@ int main(int argc, char* argv[])
updateMainFrameEvent.Init(); updateMainFrameEvent.Init();
LogManager::Init(); LogManager::Init();
EventHandler::Init();
SConfig::Init(); SConfig::Init();
CPluginManager::Init(); CPluginManager::Init();
@ -402,7 +401,6 @@ int main(int argc, char* argv[])
CPluginManager::Shutdown(); CPluginManager::Shutdown();
SConfig::Shutdown(); SConfig::Shutdown();
EventHandler::Shutdown();
LogManager::Shutdown(); LogManager::Shutdown();
cmdline_parser_free (&args_info); cmdline_parser_free (&args_info);

4
Source/Core/DolphinWX/Src/SConscript
View File

@ -12,7 +12,7 @@ files = [
libs = [ libs = [
'core', 'lzo2', 'discio', 'bdisasm', 'videocommon', 'core', 'lzo2', 'discio', 'bdisasm', 'videocommon',
'inputuicommon', 'inputcommon', 'common', 'lua', 'z', 'sfml-network', 'inputcommon', 'common', 'lua', 'z', 'sfml-network',
'SDL' 'SDL'
] ]
@ -51,7 +51,7 @@ if wxenv['HAVE_WX']:
'wxNEEDS_CHARPP', 'wxNEEDS_CHARPP',
], ],
libs = [ 'debwx', 'debugger_ui_util'] + libs libs = [ 'debwx', 'debugger_ui_util', 'inputuicommon'] + libs
else: else:
files+= [ files+= [
'cmdline.c', 'cmdline.c',

3
Source/Core/InputCommon/Src/UDPWrapper.cpp
View File

@ -84,6 +84,8 @@ UDPWrapper::~UDPWrapper()
} }
#if defined(HAVE_WX) && HAVE_WX
#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)
class UDPConfigDiag : public wxDialog class UDPConfigDiag : public wxDialog
@ -173,3 +175,4 @@ void UDPWrapper::Configure(wxWindow * parent)
diag->ShowModal(); diag->ShowModal();
diag->Destroy(); diag->Destroy();
} }
#endif

4
Source/Core/InputCommon/Src/UDPWrapper.h
View File

@ -6,6 +6,7 @@
#include "IniFile.h" #include "IniFile.h"
#include <string> #include <string>
#if defined(HAVE_WX) && HAVE_WX
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/listbox.h> #include <wx/listbox.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
@ -16,6 +17,7 @@
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
#endif
#include "UDPWiimote.h" #include "UDPWiimote.h"
@ -31,7 +33,9 @@ public:
virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
void Refresh(); void Refresh();
#if defined(HAVE_WX) && HAVE_WX
void Configure(wxWindow * parent); void Configure(wxWindow * parent);
#endif
virtual ~UDPWrapper(); virtual ~UDPWrapper();
}; };

37
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -7,28 +7,29 @@ wmenv = env.Clone()
name = "Plugin_Wiimote" name = "Plugin_Wiimote"
files = [ files = [
"Config.cpp", "Config.cpp",
"DataReports.cpp", "DataReports.cpp",
"EmuDefinitions.cpp", "EmuDefinitions.cpp",
"EmuDynamics.cpp", "EmuDynamics.cpp",
"EmuMain.cpp", "EmuMain.cpp",
"EmuPad.cpp", "EmuPad.cpp",
"EmuSubroutines.cpp", "EmuSubroutines.cpp",
"Encryption.cpp", "Encryption.cpp",
"main.cpp", "main.cpp",
"Rumble.cpp", "Rumble.cpp",
"UDPWiimote.cpp" "UDPWiimote.cpp"
] ]
if wmenv['HAVE_WX']: libs = [ 'inputcommon', 'common', 'SDL' ]
files += [
"ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp",
"ConfigGamepad.cpp",
"FillReport.cpp",
]
libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ] if wmenv['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs
files += [
"ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp",
"ConfigGamepad.cpp",
"FillReport.cpp",
]
cxxflags = [ ] cxxflags = [ ]

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

@ -7,27 +7,30 @@ name = "Plugin_WiimoteNew"
wiinewenv = env.Clone() wiinewenv = env.Clone()
files = [ files = [
'WiimoteEmu/WiimoteEmu.cpp', 'WiimoteEmu/WiimoteEmu.cpp',
'WiimoteEmu/Attachment/Classic.cpp', 'WiimoteEmu/Attachment/Classic.cpp',
'WiimoteEmu/Attachment/Attachment.cpp', 'WiimoteEmu/Attachment/Attachment.cpp',
'WiimoteEmu/Attachment/Nunchuk.cpp', 'WiimoteEmu/Attachment/Nunchuk.cpp',
'WiimoteEmu/Attachment/UDPNunchuk.cpp', 'WiimoteEmu/Attachment/UDPNunchuk.cpp',
'WiimoteEmu/Attachment/Drums.cpp', 'WiimoteEmu/Attachment/Drums.cpp',
'WiimoteEmu/Attachment/Guitar.cpp', 'WiimoteEmu/Attachment/Guitar.cpp',
'WiimoteEmu/EmuSubroutines.cpp', 'WiimoteEmu/EmuSubroutines.cpp',
'WiimoteEmu/Encryption.cpp', 'WiimoteEmu/Encryption.cpp',
'WiimoteEmu/Speaker.cpp', 'WiimoteEmu/Speaker.cpp',
'WiimoteNew.cpp', 'WiimoteNew.cpp'
'WiimoteConfigDiag.cpp',
] ]
libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ] libs = [ 'inputcommon', 'common', 'SDL' ]
cxxflags = [ ] cxxflags = [ ]
if wiinewenv['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs
files += [ 'WiimoteConfigDiag.cpp' ]
if wiinewenv['HAVE_WIIUSE']: if wiinewenv['HAVE_WIIUSE']:
cxxflags += [ '-DHAVE_WIIUSE' ] cxxflags += [ '-DHAVE_WIIUSE' ]
files += [ "WiimoteReal/WiimoteReal.cpp" ] files += [ 'WiimoteReal/WiimoteReal.cpp' ]
libs += [ 'wiiuse' ] libs += [ 'wiiuse' ]
wiinewenv.Append( wiinewenv.Append(

2
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
View File

@ -2,13 +2,13 @@
#include "Common.h" #include "Common.h"
#include "pluginspecs_wiimote.h" #include "pluginspecs_wiimote.h"
#include "WiimoteConfigDiag.h"
#include "WiimoteReal/WiimoteReal.h" #include "WiimoteReal/WiimoteReal.h"
#include "ControllerInterface/ControllerInterface.h" #include "ControllerInterface/ControllerInterface.h"
#include "WiimoteEmu/WiimoteEmu.h" #include "WiimoteEmu/WiimoteEmu.h"
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "WiimoteConfigDiag.h"
#include "../../InputUICommon/Src/ConfigDiag.h" #include "../../InputUICommon/Src/ConfigDiag.h"
#endif #endif
#include "../../InputCommon/Src/InputConfig.h" #include "../../InputCommon/Src/InputConfig.h"