piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -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

17
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -1,7 +1,6 @@
# -*- python -*-
Import('env')
import sys
name = "Plugin_DSP_HLE"
@ -23,15 +22,11 @@ files = [
'UCodes/UCode_Zelda_Synth.cpp',
]
dspenv = env.Clone()
if env['HAVE_WX']:
files += [
'ConfigDlg.cpp'
]
if dspenv['HAVE_WX']:
files += [
'ConfigDlg.cpp',
]
libs = [ 'common', 'audiocommon' ]
dspenv.Append(
LIBS = [ 'common', 'audiocommon' ],
)
dspenv.SharedLibrary(env['plugin_dir']+name, files)
env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)

22
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -1,8 +1,6 @@
# -*- python -*-
Import('env')
import sys
name = "Plugin_DSP_LLE"
@ -17,21 +15,15 @@ files = [
]
if env['HAVE_WX']:
files += [
"DSPConfigDlgLLE.cpp",
"Debugger/DSPDebugWindow.cpp",
"Debugger/DSPRegisterView.cpp",
files += [
"DSPConfigDlgLLE.cpp",
"Debugger/DSPDebugWindow.cpp",
"Debugger/DSPRegisterView.cpp",
]
lleenv = env.Clone()
libs = [ 'dspcore', 'audiocommon', 'common' ]
if env['HAVE_WX']:
lleenv.Append(
LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util' ],
)
else:
lleenv.Append(
LIBS = [ 'dspcore', 'audiocommon', 'common' ],
)
libs += [ 'debugger_ui_util' ]
lleenv.SharedLibrary(env['plugin_dir']+name, files)
env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)

27
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -23,32 +23,19 @@ files = [
'GLUtil.cpp'
]
libs = [
'videocommon', 'GLEW', 'SOIL', 'common'
]
libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ]
gfxenv = env.Clone()
if sys.platform != 'darwin':
if gfxenv['HAVE_OPENCL']:
libs += [ 'OpenCL']
if gfxenv['HAVE_WX']:
if env['HAVE_WX']:
files += [
'GUI/ConfigDlg.cpp',
'Debugger/Debugger.cpp',
]
if sys.platform == 'darwin' and not gfxenv['HAVE_WX']:
if sys.platform == 'darwin' and not env['HAVE_WX']:
files += [ 'cocoaGL.m' ]
if sys.platform == 'win32':
elif sys.platform == 'win32':
files += [ 'OS/Win32.cpp' ]
libs += [ env['base_dir'] + '/Externals/Cg/' ]
gfxenv['CPPPATH'] += libs
elif not sys.platform == 'darwin' and env['HAVE_OPENCL']:
libs += [ 'OpenCL' ]
gfxenv.SharedLibrary(
env['plugin_dir']+name,
files,
LIBS = libs + gfxenv['LIBS']
)
env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)

19
Source/Plugins/Plugin_VideoSoftware/Src/SConscript
View File

@ -33,22 +33,11 @@ files = [
'XFMemLoader.cpp',
]
libs = [
'videocommon', 'GLEW', 'SOIL', 'common'
]
libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ]
gfxenv = env.Clone()
if sys.platform == 'darwin' and not gfxenv['HAVE_WX']:
if sys.platform == 'darwin' and not env['HAVE_WX']:
files += [ 'cocoaGL.m' ]
if sys.platform == 'win32':
elif sys.platform == 'win32':
files += [ 'Win32.cpp' ]
libs += [ env['base_dir'] + '/Externals/Cg/' ]
gfxenv['CPPPATH'] += libs
gfxenv.SharedLibrary(
env['plugin_dir']+name,
files,
LIBS = libs + gfxenv['LIBS']
)
env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)

28
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -1,9 +1,7 @@
# -*- python -*-
Import('env')
import sys
# -*- python -*-
Import('env')
wmenv = env.Clone()
name = "Plugin_Wiimote"
files = [
@ -22,25 +20,17 @@ files = [
libs = [ 'inputcommon', 'common', 'SDL' ]
if wmenv['HAVE_WX']:
if env['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs
files += [
"ConfigBasicDlg.cpp",
"ConfigPadDlg.cpp",
"ConfigGamepad.cpp",
"FillReport.cpp",
]
]
cxxflags = [ ]
if env['HAVE_WIIUSE']:
libs += [ 'wiiuse' ]
files += [ 'wiimote_real.cpp' ]
if wmenv['HAVE_WIIUSE']:
libs += [ 'wiiuse' ]
files += [ "wiimote_real.cpp" ]
cxxflags += ['-DHAVE_WIIUSE']
wmenv.Append(
CXXFLAGS = cxxflags,
LIBS = libs,
)
wmenv.SharedLibrary(env['plugin_dir']+name, files)
env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)

17
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -4,7 +4,6 @@ Import('env')
import sys
name = "Plugin_WiimoteNew"
wiinewenv = env.Clone()
files = [
'WiimoteEmu/WiimoteEmu.cpp',
@ -19,25 +18,17 @@ files = [
'WiimoteNew.cpp'
]
cxxflags = [ ]
libs = [ 'inputcommon', 'common']
libs = [ 'inputcommon', 'common' ]
if sys.platform == 'win32' or sys.platform == 'linux2':
libs += [ 'SDL' ]
if wiinewenv['HAVE_WX']:
if env['HAVE_WX']:
libs = [ 'inputuicommon' ] + libs
files += [ 'WiimoteConfigDiag.cpp' ]
if wiinewenv['HAVE_WIIUSE']:
cxxflags += [ '-DHAVE_WIIUSE' ]
if env['HAVE_WIIUSE']:
files += [ 'WiimoteReal/WiimoteReal.cpp' ]
libs += [ 'wiiuse' ]
wiinewenv.Append(
CXXFLAGS = cxxflags,
LIBS = libs
)
wiinewenv.SharedLibrary(env['plugin_dir']+name, files)
env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs)