piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix OS X build.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6997 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-31 01:53:57 +00:00
parent fbaf965995
commit 18bb65b300
11 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,10 +252,8 @@ void CConfigMain::UpdateGUI()
PathsPage->Disable();
#if defined _WIN32 || defined __linux__
// Disable stuff on PluginsPage
GraphicSelection->Disable();
#endif
}
}
@ -876,7 +874,6 @@ 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);
@ -891,7 +888,6 @@ void CConfigMain::CreateGUIControls()
//sPluginsPage->Add(sbGraphicsPlugin, 0, wxEXPAND|wxALL, 5);
//PluginsPage->SetSizer(sPluginsPage);
#endif
m_Ok = new wxButton(this, wxID_OK);

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

@ -7,9 +7,10 @@ from SconsTests import utils
files = ['BootManager.cpp']
# 'plugin_videosoftware',
libs = [
'core',
'audiocommon', 'common', 'discio', 'inputcommon',
'core', 'discio', 'plugin_videoogl',
'audiocommon', 'common', 'inputcommon', 'videocommon',
'GLEW', 'SOIL', 'bdisasm', 'lua', 'lzo2', 'sfml-network', 'z',
]
@ -55,12 +56,11 @@ else:
env.StaticLibrary(env['local_libs'] + "dolphinwx", libfiles)
wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx']
wxlibs += ['debwx', 'debugger_ui_util', 'dolphinwx', 'videouicommon']
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
elif sys.platform == 'darwin':
ldflags += [ '-Wl,-force_load,' + env['libvideo'][0].path ]
ldflags += [ '-Xarch_i386', '-Wl,-framework,QuickTime' ]
ldflags += [ '-weak_framework', 'OpenCL' ]
@ -126,8 +126,6 @@ elif sys.platform == 'darwin':
else:
files += [ 'X11Utils.cpp' ]
libs += [ 'SDL', 'clrun' ]
ldflags += [ '-Wl,--whole-archive,' + env['libvideo'][0].path ]
ldflags += [ '-Wl,--no-whole-archive' ]
if env['HAVE_WX']:
exe = env['binary_dir'] + '/dolphin-emu'
else:
@ -138,5 +136,4 @@ else:
libs = wxlibs + libs + env['LIBS']
linkflags = ldflags + env['LINKFLAGS']
env.Depends(exe, env['libvideo'])
env.Program(exe, files, LIBS = libs, LINKFLAGS = linkflags)