ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
NeoBrainX 2010-10-05 18:10:06 +00:00
parent 6c8fc66698
commit 4153e6eee1
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'])

2
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -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'])

2
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -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'])

2
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -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'])

3
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -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'])