piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of a number of unnecessary env.Clones.

Browse Source 
Use SCons' convenient # shorthand for the root of our tree.
 
Also various minor cleanup of SConscripts.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5915 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-07-19 03:42:37 +00:00
parent 4ecfa3b7a2
commit a2b1f829cb
29 changed files with 223 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,6 @@ Import('env')
import os
import sys
wxenv = env.Clone()
files = [
'BootManager.cpp',
]
@ -15,14 +13,13 @@ libs = [
'inputcommon', 'common', 'lua', 'z', 'sfml-network',
]
if wxenv['HAVE_WX']:
if env['HAVE_WX']:
memcardfiles = [
'MemcardManager.cpp',
'MemoryCards/GCMemcard.cpp',
'WxUtils.cpp',
]
]
files += memcardfiles
files += [
'AboutDolphin.cpp',
'ARCodeAddEdit.cpp',
@ -38,6 +35,7 @@ if wxenv['HAVE_WX']:
'ISOProperties.cpp',
'PatchAddEdit.cpp',
'CheatsWindow.cpp',
'Main.cpp',
'MemoryCards/WiiSaveCrypted.cpp',
'NetPlay.cpp',
'NetPlayClient.cpp',
@ -45,28 +43,29 @@ if wxenv['HAVE_WX']:
'NetWindow.cpp',
]
libs = [ 'debwx', 'debugger_ui_util', 'inputuicommon'] + libs
wxlibs = [ 'debwx', 'debugger_ui_util', 'inputuicommon', 'memcard' ]
else:
files+= [
'MainNoGUI.cpp',
'cmdline.c',
]
if sys.platform == 'win32':
files += [ "stdafx.cpp" ]
elif sys.platform == 'darwin' and not wxenv['HAVE_WX']:
elif sys.platform == 'darwin' and not env['HAVE_WX']:
files += [ 'cocoaApp.m' ]
exeNoGUI = env['binary_dir'] + 'DolphinNoGUI'
elif sys.platform == 'darwin' and wxenv['HAVE_WX']:
elif sys.platform == 'darwin' and env['HAVE_WX']:
exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin'
wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/' +
env.Install(env['binary_dir'] + 'Dolphin.app/Contents/' +
'Library/Frameworks/Cg.framework',
'#Externals/Cg/Cg.framework/Cg')
wxenv.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/',
env.Install(env['binary_dir'] + 'Dolphin.app/Contents/Resources/',
'#Source/Core/DolphinWX/resources/Dolphin.icns')
wxenv.Plist(
env.Plist(
env['binary_dir'] + 'Dolphin.app/Contents/Info.plist',
Value(dict(
CFBundleExecutable = 'Dolphin',
@ -85,12 +84,8 @@ else:
exeGUI = env['binary_dir'] + 'dolphin-emu'
exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui'
wxenv.Append(
LIBS = libs
)
if wxenv['HAVE_WX']:
wxenv.Program(exeGUI, files + [ 'Main.cpp' ])
wxenv.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
if env['HAVE_WX']:
env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles)
env.Program(exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs)
else:
wxenv.Program(exeNoGUI, files + [ 'MainNoGUI.cpp' ])
env.Program(exeNoGUI, files, LIBS = env['LIBS'] + libs)