diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-10-30 10:54:41 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-10-30 10:54:41 +0000 |
| commit | 922bb419f46c43d46be5617e6760bbbdb8261f2e (patch) | |
| tree | 49cd310e777d804df7f91330b8b1d0a26acc7d53 /Source/Core | |
| parent | c015811d4d256d807f345fb63316f00682de32af (diff) | |
Remove vestiges of standalone memcard manager build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6321 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 50c50c83f1..bdad6a7958 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -15,12 +15,6 @@ libs = [ ] if env['HAVE_WX']: - memcardfiles = [ - 'MemcardManager.cpp', - 'MemoryCards/GCMemcard.cpp', - 'WxUtils.cpp', - ] - files += [ 'AboutDolphin.cpp', 'ARCodeAddEdit.cpp', @@ -40,15 +34,18 @@ if env['HAVE_WX']: 'PatchAddEdit.cpp', 'CheatsWindow.cpp', 'Main.cpp', + 'MemcardManager.cpp', + 'MemoryCards/GCMemcard.cpp', 'MemoryCards/WiiSaveCrypted.cpp', 'NetPlay.cpp', 'NetPlayClient.cpp', 'NetPlayServer.cpp', 'NetWindow.cpp', 'WiimoteConfigDiag.cpp', + 'WxUtils.cpp', ] - wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon', 'memcard' ] + wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon' ] else: files+= [ 'MainNoGUI.cpp', @@ -107,7 +104,6 @@ else: env.InstallAs(env['data_dir'] + '/user', '#Data/User') if env['HAVE_WX']: - env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles) env.Program(exeGUI, files, LIBS = wxlibs + libs + env['LIBS']) else: env.Program(exeNoGUI, files, LIBS = libs + env['LIBS']) |