From 4153e6eee1c3e8678b50083354f660912f6f677c Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Tue, 5 Oct 2010 18:10:06 +0000 Subject: [PATCH] Fix building with --as-needed. Fixes issue 3301. Patch by Christian.Morales.Vega, thanks ;) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6258 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/SConscript | 4 ++-- Source/Plugins/Plugin_DSP_HLE/Src/SConscript | 2 +- Source/Plugins/Plugin_DSP_LLE/Src/SConscript | 2 +- Source/Plugins/Plugin_Wiimote/Src/SConscript | 2 +- Source/Plugins/Plugin_WiimoteNew/Src/SConscript | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 7b843d416f..e6800a142d 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -105,6 +105,6 @@ else: if env['HAVE_WX']: env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles) - env.Program(exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs) + env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS']) else: - env.Program(exeNoGUI, files, LIBS = env['LIBS'] + libs) + env.Program(exeNoGUI, files, LIBS = libs + env['LIBS']) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript index da864668ec..660e037e22 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript @@ -31,4 +31,4 @@ if env['HAVE_WX']: libs = [ 'common', 'audiocommon' ] -env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = libs + env['LIBS']) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index 5b7791906f..a7cee3b9fb 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -27,4 +27,4 @@ libs = [ 'dspcore', 'audiocommon', 'common' ] if env['HAVE_WX']: libs += [ 'debugger_ui_util' ] -env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = libs + env['LIBS']) diff --git a/Source/Plugins/Plugin_Wiimote/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript index c246b0830c..ca28e751f2 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript @@ -34,4 +34,4 @@ if env['HAVE_WIIUSE']: libs += [ 'wiiuse' ] files += [ 'wiimote_real.cpp' ] -env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = libs + env['LIBS']) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript index 108566f78a..1ad8a1576f 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript +++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript @@ -14,6 +14,7 @@ files = [ 'WiimoteEmu/Attachment/Drums.cpp', 'WiimoteEmu/Attachment/Guitar.cpp', 'WiimoteEmu/Attachment/Turntable.cpp', + 'WiimoteEmu/Attachment/Turntable.cpp', 'WiimoteEmu/EmuSubroutines.cpp', 'WiimoteEmu/Encryption.cpp', 'WiimoteEmu/Speaker.cpp', @@ -33,4 +34,4 @@ if env['HAVE_WIIUSE']: files += [ 'WiimoteReal/WiimoteReal.cpp' ] libs += [ 'wiiuse' ] -env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = libs + env['LIBS'])