The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 22:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Indent consistently. Please, no more mixing of tabs and spaces!

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1034 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-11-01 17:07:35 +00:00
parent 046ca53f8c
commit f27c6f514c
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,52 +10,51 @@ files = [
] ]
if not env['osx64']: if not env['osx64']:
files += [ files += [
'AboutDolphin.cpp', 'AboutDolphin.cpp',
'ConfigMain.cpp', 'ConfigMain.cpp',
'FileSearch.cpp', 'FileSearch.cpp',
'FilesystemViewer.cpp', 'FilesystemViewer.cpp',
'Frame.cpp', 'Frame.cpp',
'GameListCtrl.cpp', 'GameListCtrl.cpp',
'Globals.cpp', 'Globals.cpp',
'ISOFile.cpp', 'ISOFile.cpp',
'MemcardManager.cpp', 'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp', 'MemoryCards/GCMemcard.cpp',
'PluginManager.cpp', 'PluginManager.cpp',
'stdafx.cpp', 'stdafx.cpp',
] ]
libs = [ libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z' 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
] ]
wxenv = env.Clone() wxenv = env.Clone()
if not wxenv['osx64']: if not wxenv['osx64']:
libs = [ 'debwx' ] + libs libs = [ 'debwx' ] + libs
wxenv.Append( wxenv.Append(
CPPDEFINES = [ CPPDEFINES = [
'USE_XPM_BITMAPS', 'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP', 'wxNEEDS_CHARPP',
], ],
LINKFLAGS = [ LINKFLAGS = [
'-pthread', '-pthread',
], ],
LIBS = libs LIBS = libs
) )
else: else:
wxenv.Append( wxenv.Append(
CPPDEFINES = [ CPPDEFINES = [
'USE_XPM_BITMAPS', 'USE_XPM_BITMAPS',
'wxNEEDS_CHARPP', 'wxNEEDS_CHARPP',
], ],
LINKFLAGS = [ LINKFLAGS = [
'-pthread', '-pthread',
'-arch', '-arch',
'x86_64' 'x86_64'
], ],
LIBS = libs LIBS = libs
) )
if sys.platform == 'darwin': if sys.platform == 'darwin':
exeGUI = '../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin' exeGUI = '../../../../Binary/mac/Dolphin.app/Contents/MacOS/Dolphin'
@ -87,5 +86,5 @@ else:
objects = [ wxenv.Object(srcFile) for srcFile in files ] objects = [ wxenv.Object(srcFile) for srcFile in files ]
if not wxenv['osx64']: if not wxenv['osx64']:
wxenv.Program(exeGUI, objects + [ 'Main.cpp' ]) wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ]) wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])