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

Remove vestiges of standalone memcard manager build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6321 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-10-30 10:54:41 +00:00
parent c015811d4d
commit 922bb419f4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,6 @@ libs = [
] ]
if env['HAVE_WX']: if env['HAVE_WX']:
memcardfiles = [
'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp',
'WxUtils.cpp',
]
files += [ files += [
'AboutDolphin.cpp', 'AboutDolphin.cpp',
'ARCodeAddEdit.cpp', 'ARCodeAddEdit.cpp',
@ -40,15 +34,18 @@ if env['HAVE_WX']:
'PatchAddEdit.cpp', 'PatchAddEdit.cpp',
'CheatsWindow.cpp', 'CheatsWindow.cpp',
'Main.cpp', 'Main.cpp',
'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp',
'MemoryCards/WiiSaveCrypted.cpp', 'MemoryCards/WiiSaveCrypted.cpp',
'NetPlay.cpp', 'NetPlay.cpp',
'NetPlayClient.cpp', 'NetPlayClient.cpp',
'NetPlayServer.cpp', 'NetPlayServer.cpp',
'NetWindow.cpp', 'NetWindow.cpp',
'WiimoteConfigDiag.cpp', 'WiimoteConfigDiag.cpp',
'WxUtils.cpp',
] ]
wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon', 'memcard' ] wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon' ]
else: else:
files+= [ files+= [
'MainNoGUI.cpp', 'MainNoGUI.cpp',
@ -107,7 +104,6 @@ else:
env.InstallAs(env['data_dir'] + '/user', '#Data/User') env.InstallAs(env['data_dir'] + '/user', '#Data/User')
if env['HAVE_WX']: if env['HAVE_WX']:
env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS']) env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS'])
else: else:
env.Program(exeNoGUI, files, LIBS = libs + env['LIBS']) env.Program(exeNoGUI, files, LIBS = libs + env['LIBS'])