From 8c0f17eece43c4108cf0b7b0fa22eba4520a321c Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 15 Jan 2011 14:36:32 +0000 Subject: [PATCH] Fix OS X build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6855 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/SConscript | 3 ++- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index bc99d08f51..0534b1fdb0 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -47,10 +47,11 @@ if env['HAVE_WX']: 'NetWindow.cpp', 'UDPConfigDiag.cpp', 'WiimoteConfigDiag.cpp', + 'WXInputBase.cpp', 'WxUtils.cpp', ] - wxlibs += [ 'debwx', 'debugger_ui_util', 'inputuicommon' ] + wxlibs += [ 'debwx', 'debugger_ui_util' ] else: files += [ 'MainNoGUI.cpp', diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 1327a210d2..a8131e4964 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -21,6 +21,9 @@ files = [ 'GLUtil.cpp' ] -libs = [ 'videocommon', 'videouicommon', 'GLEW', 'SOIL', 'common' ] +libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ] + +if env['HAVE_WX']: + libs += [ 'videouicommon' ] env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)