piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Link the video plugin statically into the main binary on OS X.

Browse Source 
This makes the OS X build more robust and should help pave the
way for the integration of the video plugins as well as LTO.

There are now no more global class level namespace conflicts left,
as evidenced by the fact that Dolphin can be linked with -all_load,
not that you would want to.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6958 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-29 04:52:19 +00:00
parent 4c58c7ea03
commit 1bcad428ea
25 changed files with 145 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -251,8 +251,10 @@ void CConfigMain::UpdateGUI()
PathsPage->Disable();
#if defined _WIN32 || defined __linux__
// Disable stuff on PluginsPage
GraphicSelection->Disable();
#endif
}
}
@ -434,8 +436,10 @@ void CConfigMain::InitializeGUIValues()
ApploaderPath->SetPath(wxString(startup_params.m_strApploader.c_str(), *wxConvCurrent));
#if defined _WIN32 || defined __linux__
// Plugins
FillChoiceBox(GraphicSelection, PLUGIN_TYPE_VIDEO, startup_params.m_strVideoPlugin);
#endif
}
void CConfigMain::InitializeGUITooltips()
@ -501,10 +505,12 @@ void CConfigMain::CreateGUIControls()
Notebook->AddPage(GeneralPage, _("General"));
Notebook->AddPage(DisplayPage, _("Display"));
Notebook->AddPage(AudioPage, _("Audio"));
Notebook->AddPage(GamecubePage, _("GC"));
Notebook->AddPage(GamecubePage, _("Gamecube"));
Notebook->AddPage(WiiPage, _("Wii"));
Notebook->AddPage(PathsPage, _("Paths"));
#if defined _WIN32 || defined __linux__
Notebook->AddPage(PluginsPage, _("Plugins"));
#endif
// General page
@ -865,6 +871,7 @@ void CConfigMain::CreateGUIControls()
PathsPage->SetSizer(sPathsPage);
#if defined _WIN32 || defined __linux__
// Plugins page
sbGraphicsPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginsPage, _("Graphics"));
GraphicSelection = new wxChoice(PluginsPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, 0, NULL, 0, wxDefaultValidator);
@ -879,6 +886,7 @@ void CConfigMain::CreateGUIControls()
sPluginsPage->Add(sbGraphicsPlugin, 0, wxEXPAND|wxALL, 5);
PluginsPage->SetSizer(sPluginsPage);
#endif
m_Ok = new wxButton(this, wxID_OK);

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

@ -10,8 +10,8 @@ files = [
]
libs = [
'audiocommon', 'core', 'dspcore', 'lzo2', 'discio', 'bdisasm',
'inputcommon', 'common', 'lua', 'z', 'sfml-network',
'audiocommon', 'bdisasm', 'common', 'core', 'discio', 'dspcore',
'inputcommon', 'lua', 'lzo2', 'sfml-network', 'z', 'GLEW', 'SOIL',
]
wxlibs = [ ]
@ -62,9 +62,8 @@ else:
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
elif sys.platform == 'darwin':
ldflags += [ '-Wl,-pagezero_size,0x1000' ]
ldflags += [ '-Wl,-ObjC' ] # XXX Hack to include wxGLCanvas
libs += [ 'iconv' ]
ldflags += [ '-Wl,-force_load,' + env['libvideo'][0].path ]
exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
if env['HAVE_WX']: