diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2008-11-01 17:07:35 +0000 |
|---|---|---|
| committer | Maarten ter Huurne <maarten@treewalker.org> | 2008-11-01 17:07:35 +0000 |
| commit | f27c6f514c29f729f682b03db2cb12e4f6cbf08b (patch) | |
| tree | 4ef0472c15a97356b3aa64bab57c5f7c838baf00 /Source/Core | |
| parent | 046ca53f8c0827d37f5f7e009e0c3e2dfec74a10 (diff) | |
Indent consistently. Please, no more mixing of tabs and spaces!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1034 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 62284894a6..0e3b023a4e 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -10,52 +10,51 @@ files = [ ] if not env['osx64']: - files += [ + files += [ 'AboutDolphin.cpp', - 'ConfigMain.cpp', - 'FileSearch.cpp', - 'FilesystemViewer.cpp', - 'Frame.cpp', - 'GameListCtrl.cpp', - 'Globals.cpp', - 'ISOFile.cpp', - 'MemcardManager.cpp', - 'MemoryCards/GCMemcard.cpp', - 'PluginManager.cpp', - 'stdafx.cpp', + 'ConfigMain.cpp', + 'FileSearch.cpp', + 'FilesystemViewer.cpp', + 'Frame.cpp', + 'GameListCtrl.cpp', + 'Globals.cpp', + 'ISOFile.cpp', + 'MemcardManager.cpp', + 'MemoryCards/GCMemcard.cpp', + 'PluginManager.cpp', + 'stdafx.cpp', ] - libs = [ 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' ] wxenv = env.Clone() if not wxenv['osx64']: - libs = [ 'debwx' ] + libs - wxenv.Append( - CPPDEFINES = [ - 'USE_XPM_BITMAPS', - 'wxNEEDS_CHARPP', - ], - LINKFLAGS = [ - '-pthread', - ], - LIBS = libs - ) + libs = [ 'debwx' ] + libs + wxenv.Append( + CPPDEFINES = [ + 'USE_XPM_BITMAPS', + 'wxNEEDS_CHARPP', + ], + LINKFLAGS = [ + '-pthread', + ], + LIBS = libs + ) else: - wxenv.Append( - CPPDEFINES = [ - 'USE_XPM_BITMAPS', - 'wxNEEDS_CHARPP', - ], - LINKFLAGS = [ - '-pthread', - '-arch', - 'x86_64' - ], - LIBS = libs - ) + wxenv.Append( + CPPDEFINES = [ + 'USE_XPM_BITMAPS', + 'wxNEEDS_CHARPP', + ], + LINKFLAGS = [ + '-pthread', + '-arch', + 'x86_64' + ], + LIBS = libs + ) if sys.platform == 'darwin': exeGUI = '../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin' @@ -87,5 +86,5 @@ else: objects = [ wxenv.Object(srcFile) for srcFile in files ] if not wxenv['osx64']: - wxenv.Program(exeGUI, objects + [ 'Main.cpp' ]) + wxenv.Program(exeGUI, objects + [ 'Main.cpp' ]) wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ]) |