The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 14:39:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Virtual base classes should have a virtual destructor.

Browse Source 
Build a libdolphinwx. Just fooling around with LTO..


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6981 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-30 01:58:54 +00:00
parent 25af2ae9b8
commit f57cfc7c6f
11 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -148,7 +148,7 @@ if sys.platform == 'darwin':
wxconfig.ParseWXConfig(wxenv) wxconfig.ParseWXConfig(wxenv)
env['CPPDEFINES'] += ['__WXOSX_COCOA__'] env['CPPDEFINES'] += ['__WXOSX_COCOA__']
env['CPPPATH'] += wxenv['CPPPATH'] env['CPPPATH'] += wxenv['CPPPATH']
env['LIBPATH'] += wxenv['LIBPATH'] #env['LIBPATH'] += wxenv['LIBPATH']
env['wxconfiglibs'] = wxenv['LIBS'] env['wxconfiglibs'] = wxenv['LIBS']
env['CPPPATH'] += ['#Externals'] env['CPPPATH'] += ['#Externals']

1
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
View File

@ -28,7 +28,6 @@ class IUCode;
class DSPHLE : public PluginDSP { class DSPHLE : public PluginDSP {
public: public:
DSPHLE(); DSPHLE();
~DSPHLE();
virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread); virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread);
virtual void Shutdown(); virtual void Shutdown();

3
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
View File

@ -48,9 +48,6 @@ DSPLLE::DSPLLE() {
m_cycle_count = 0; m_cycle_count = 0;
} }
DSPLLE::~DSPLLE() {
}
void DSPLLE::DoState(PointerWrap &p) void DSPLLE::DoState(PointerWrap &p)
{ {
p.Do(m_InitMixer); p.Do(m_InitMixer);

1
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
View File

@ -26,7 +26,6 @@
class DSPLLE : public PluginDSP { class DSPLLE : public PluginDSP {
public: public:
DSPLLE(); DSPLLE();
~DSPLLE();
virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread); virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread);
virtual void Shutdown(); virtual void Shutdown();

3
Source/Core/Core/Src/PluginDSP.cpp
View File

@ -33,6 +33,3 @@ PluginDSP *CreateDSPPlugin(bool HLE)
return new DSPLLE(); return new DSPLLE();
} }
} }
PluginDSP::PluginDSP() {}
PluginDSP::~PluginDSP() {}

3
Source/Core/Core/Src/PluginDSP.h
View File

@ -25,8 +25,7 @@
class PluginDSP class PluginDSP
{ {
public: public:
PluginDSP(); virtual ~PluginDSP() {}
~PluginDSP();
virtual bool IsLLE() = 0; virtual bool IsLLE() = 0;

2
Source/Core/Core/Src/PowerPC/CPUCoreBase.h
View File

@ -21,6 +21,8 @@
class CPUCoreBase class CPUCoreBase
{ {
public: public:
virtual ~CPUCoreBase() {}
virtual void Init() = 0; virtual void Init() = 0;
virtual void Shutdown() = 0; virtual void Shutdown() = 0;
virtual void ClearCache() = 0; virtual void ClearCache() = 0;

4
Source/Core/DolphinWX/Src/InputConfigDiag.cpp
View File

@ -105,7 +105,7 @@ void PadSettingCheckBox::UpdateValue()
void PadSettingSpin::UpdateGUI() void PadSettingSpin::UpdateGUI()
{ {
((wxSpinCtrl*)wxcontrol)->SetValue(value * 100); ((wxSpinCtrl*)wxcontrol)->SetValue((int)(value * 100));
} }
void PadSettingSpin::UpdateValue() void PadSettingSpin::UpdateValue()
@ -536,7 +536,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(wxWindow* const parent, wx
range_slider = new wxSlider(parent, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); range_slider = new wxSlider(parent, -1, SLIDER_TICK_COUNT, 0, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/);
range_slider->SetValue(control_reference->range * SLIDER_TICK_COUNT); range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT));
_connect_macro_(detect_button, ControlDialog::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); _connect_macro_(detect_button, ControlDialog::DetectControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);
_connect_macro_(clear_button, ControlDialog::ClearControl, wxEVT_COMMAND_BUTTON_CLICKED, parent); _connect_macro_(clear_button, ControlDialog::ClearControl, wxEVT_COMMAND_BUTTON_CLICKED, parent);

2
Source/Core/DolphinWX/Src/InputConfigDiag.h
View File

@ -74,7 +74,7 @@ class PadSettingSpin : public PadSetting
public: public:
PadSettingSpin(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const setting) PadSettingSpin(wxWindow* const parent, ControllerEmu::ControlGroup::Setting* const setting)
: PadSetting(new wxSpinCtrl(parent, -1, wxEmptyString, wxDefaultPosition : PadSetting(new wxSpinCtrl(parent, -1, wxEmptyString, wxDefaultPosition
, wxSize(54, -1), 0, setting->low, setting->high, setting->value * 100)) , wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100)))
, value(setting->value) {} , value(setting->value) {}
void UpdateGUI(); void UpdateGUI();

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

@ -5,9 +5,7 @@ import os
import sys import sys
from SconsTests import utils from SconsTests import utils
files = [ files = ['BootManager.cpp']
'BootManager.cpp',
]
libs = [ libs = [
'core', 'core',
@ -19,8 +17,12 @@ wxlibs = [ ]
ldflags = [ ] ldflags = [ ]
if env['HAVE_WX']: if not env['HAVE_WX']:
files += [ files += ['MainNoGUI.cpp']
else:
files += ['Main.cpp']
libfiles = [
'AboutDolphin.cpp', 'AboutDolphin.cpp',
'ARCodeAddEdit.cpp', 'ARCodeAddEdit.cpp',
'GeckoCodeDiag.cpp', 'GeckoCodeDiag.cpp',
@ -38,7 +40,6 @@ if env['HAVE_WX']:
'ISOProperties.cpp', 'ISOProperties.cpp',
'PatchAddEdit.cpp', 'PatchAddEdit.cpp',
'CheatsWindow.cpp', 'CheatsWindow.cpp',
'Main.cpp',
'MemcardManager.cpp', 'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp', 'MemoryCards/GCMemcard.cpp',
'MemoryCards/WiiSaveCrypted.cpp', 'MemoryCards/WiiSaveCrypted.cpp',
@ -52,11 +53,9 @@ if env['HAVE_WX']:
'WxUtils.cpp', 'WxUtils.cpp',
] ]
wxlibs += [ 'debwx', 'debugger_ui_util' ] env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
else:
files += [ wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx']
'MainNoGUI.cpp',
]
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ "stdafx.cpp" ] files += [ "stdafx.cpp" ]

2
Source/Core/VideoCommon/Src/Debugger.h
View File

@ -21,6 +21,8 @@
class GFXDebuggerBase class GFXDebuggerBase
{ {
public: public:
virtual ~GFXDebuggerBase() {}
// if paused, debugging functions can be enabled // if paused, debugging functions can be enabled
virtual void OnPause() {}; virtual void OnPause() {};
virtual void OnContinue() {}; virtual void OnContinue() {};