Get rid of a number of unnecessary env.Clones.

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
2025-08-01 10:39:45 -06:00 · 2010-07-19 03:42:37 +00:00
parent 4ecfa3b7a2
commit a2b1f829cb
29 changed files with 223 additions and 347 deletions
--- a/Source/Core/AudioCommon/Src/SConscript
+++ b/Source/Core/AudioCommon/Src/SConscript
@ -4,25 +4,24 @@ Import('env')
 import sys

 files = [
-    'AudioCommonConfig.cpp',
-    'WaveFile.cpp',
-    'Mixer.cpp',
-    'AudioCommon.cpp',
-    ]
-
-if sys.platform == 'win32':
-    files += [ 'DSoundStream.cpp' ]
+	'AudioCommonConfig.cpp',
+	'WaveFile.cpp',
+	'Mixer.cpp',
+	'AudioCommon.cpp',
+	]

 if sys.platform == 'darwin':
-    files += [ 'CoreAudioSoundStream.cpp' ]
+	files += [ 'CoreAudioSoundStream.cpp' ]
 else:
-    if env['HAVE_ALSA']:
-        files += [ 'AlsaSoundStream.cpp' ]
-    if env['HAVE_AO']:
-        files += [ 'AOSoundStream.cpp' ]
-    if env['HAVE_OPENAL'] or sys.platform == 'win32':
-        files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
-    if env['HAVE_PULSEAUDIO']:
-        files += [ 'PulseAudioStream.cpp' ]
-    
+	if env['HAVE_ALSA']:
+		files += [ 'AlsaSoundStream.cpp' ]
+	if env['HAVE_AO']:
+		files += [ 'AOSoundStream.cpp' ]
+	if env['HAVE_OPENAL'] or sys.platform == 'win32':
+		files += [ 'OpenALStream.cpp', 'aldlist.cpp' ]
+	if env['HAVE_PULSEAUDIO']:
+		files += [ 'PulseAudioStream.cpp' ]
+	if sys.platform == 'win32':
+		files += [ 'DSoundStream.cpp' ]
+
 env.StaticLibrary(env['local_libs'] + 'audiocommon', files)
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@ -57,6 +57,7 @@ extern const char *netplay_dolphin_ver;
 #undef STACKALIGN
 #define STACKALIGN __attribute__((__force_align_arg_pointer__))
 #endif
+#define HAVE_WIIUSE 1
 // We use wxWidgets on OS X only if it is version 2.9+ with Cocoa support.
 #ifdef __WXOSX_COCOA__
 #define HAVE_WX 1
@ -114,6 +115,10 @@ extern const char *netplay_dolphin_ver;
 #include "Config.h"	// SCons autoconfiguration defines
 #endif

+#if defined __linux__ && HAVE_BLUEZ
+#define HAVE_WIIUSE 1
+#endif
+
 // Windows compatibility
 #ifndef _WIN32
 #include <limits.h>
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
@ -71,6 +71,7 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void
 	{
 		// a == 0, which for these instructions imply value = 0
 		gpr.SetImmediate32(d, value);
+// XXX soren
 		gpr.StoreFromX64(d);
 	}
 	else
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@ -126,16 +126,15 @@ files = [
 if sys.platform == 'win32':
 	files += [ "HW/BBA-TAP/TAP_Win32.cpp", "stdafx.cpp" ]
 elif sys.platform == 'darwin':
-	files += [ "HW/BBA-TAP/TAP_Apple.cpp"]
+	files += [ "HW/BBA-TAP/TAP_Apple.cpp" ]
 else:
-	files += [ "HW/BBA-TAP/TAP_Unix.cpp"]
+	files += [ "HW/BBA-TAP/TAP_Unix.cpp" ]

 libs = [
 	'bdisasm',
 	'inputcommon',
 	'lua',
-	'sfml-network'
+	'sfml-network',
 	]

-env_core = env.Clone();
-env_core.StaticLibrary(env['local_libs'] + 'core', files, LIBS=libs)
+env.StaticLibrary(env['local_libs'] + 'core', files, LIBS = libs)
--- a/Source/Core/DSPCore/Src/SConscript
+++ b/Source/Core/DSPCore/Src/SConscript
@ -3,29 +3,29 @@
 Import('env')

 files = [
-    "assemble.cpp",
-    "disassemble.cpp",
-    "DSPAccelerator.cpp",
-    "DSPIntCCUtil.cpp",
-    "DSPIntExtOps.cpp",
-    "DSPHWInterface.cpp",
-    "DSPMemoryMap.cpp",
-    "DSPStacks.cpp",
-    "DSPAnalyzer.cpp",
-    "DspIntArithmetic.cpp",
-    "DspIntBranch.cpp",
-    "DspIntLoadStore.cpp",
-    "DspIntMisc.cpp",
-    "DspIntMultiplier.cpp",
-    "DSPEmitter.cpp",
-    "DSPCodeUtil.cpp",
-    "LabelMap.cpp",
-    "DSPInterpreter.cpp",
-    "DSPCore.cpp",
-    "DSPTables.cpp",
-    "Jit/DSPJitExtOps.cpp",
-    "Jit/DSPJitUtil.cpp",
-    "Jit/DSPJitMisc.cpp",
-    ]
+	"assemble.cpp",
+	"disassemble.cpp",
+	"DSPAccelerator.cpp",
+	"DSPIntCCUtil.cpp",
+	"DSPIntExtOps.cpp",
+	"DSPHWInterface.cpp",
+	"DSPMemoryMap.cpp",
+	"DSPStacks.cpp",
+	"DSPAnalyzer.cpp",
+	"DspIntArithmetic.cpp",
+	"DspIntBranch.cpp",
+	"DspIntLoadStore.cpp",
+	"DspIntMisc.cpp",
+	"DspIntMultiplier.cpp",
+	"DSPEmitter.cpp",
+	"DSPCodeUtil.cpp",
+	"LabelMap.cpp",
+	"DSPInterpreter.cpp",
+	"DSPCore.cpp",
+	"DSPTables.cpp",
+	"Jit/DSPJitExtOps.cpp",
+	"Jit/DSPJitUtil.cpp",
+	"Jit/DSPJitMisc.cpp",
+	]

 env.StaticLibrary(env['local_libs'] + 'dspcore', files)
--- a/Source/Core/DebuggerUICommon/Src/SConscript
+++ b/Source/Core/DebuggerUICommon/Src/SConscript
@ -1,7 +1,6 @@
 # -*- python -*-

 Import('env')
-import sys

 if not env['HAVE_WX']:
 	Return()
--- a/Source/Core/DebuggerWX/Src/SConscript
+++ b/Source/Core/DebuggerWX/Src/SConscript
@ -3,24 +3,24 @@
 Import('env')

 if not env['HAVE_WX']:
-    Return()
+	Return()

 files = [
-    "BreakpointDlg.cpp",
-    "BreakpointView.cpp",
-    "BreakpointWindow.cpp",
-    "CodeWindow.cpp",
-    "CodeWindowFunctions.cpp",
-    "MemoryCheckDlg.cpp",
-    "MemoryWindow.cpp",
-    "RegisterWindow.cpp",
-    "RegisterView.cpp",
-    "JitWindow.cpp",
-    ]
+	"BreakpointDlg.cpp",
+	"BreakpointView.cpp",
+	"BreakpointWindow.cpp",
+	"CodeWindow.cpp",
+	"CodeWindowFunctions.cpp",
+	"MemoryCheckDlg.cpp",
+	"MemoryWindow.cpp",
+	"RegisterWindow.cpp",
+	"RegisterView.cpp",
+	"JitWindow.cpp",
+	]

 libs = [
-    'common',
-    'debugger_ui_util'
-]
+	'common',
+	'debugger_ui_util'
+	]

 env.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs)
--- a/Source/Core/DiscIO/Src/SConscript
+++ b/Source/Core/DiscIO/Src/SConscript
@ -20,7 +20,7 @@ files = [
 	'VolumeGC.cpp',
 	'VolumeWad.cpp',
 	'VolumeWiiCrypted.cpp',
-        'FileMonitor.cpp',
+	'FileMonitor.cpp',
 	'NANDContentLoader.cpp',
 	'WiiWad.cpp',
 	'AES/aes_cbc.c',
@ -30,4 +30,5 @@ files = [
 libs = [
 	'common'
 	]
+
 env.StaticLibrary(env['local_libs'] + 'discio', files, LIBS = libs)
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@ -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)
--- a/Source/Core/InputUICommon/Src/SConscript
+++ b/Source/Core/InputUICommon/Src/SConscript
@ -1,7 +1,6 @@
 # -*- python -*-

 Import('env')
-import sys

 if not env['HAVE_WX']:
 	Return()
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@ -39,8 +39,8 @@ files = [
 	]

 if env['HAVE_OPENCL']:
-    files += [
-        'OpenCL/OCLTextureDecoder.cpp',
-        ]
+	files += [
+		'OpenCL/OCLTextureDecoder.cpp',
+		]

 env.StaticLibrary(env['local_libs'] + "videocommon", files)
--- a/Source/DSPTool/Src/SConscript
+++ b/Source/DSPTool/Src/SConscript
@ -1,19 +1,14 @@
 # -*- python -*-

 Import('env')
-import sys
-
-dtenv = env.Clone()

 files = [
-    'main.cpp',
-    ]
+	'main.cpp',
+	]

 libs = [
-    'dspcore',
-    'common',
-]
+	'dspcore',
+	'common',
+	]

-dtenv.Append(LIBS = libs)
-
-dtenv.Program(dtenv['binary_dir'] + 'dsptool', files)
+env.Program(env['binary_dir'] + 'dsptool', files, LIBS = libs)
--- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
@ -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)
--- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
@ -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)
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@ -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)
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
@ -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)
--- a/Source/Plugins/Plugin_Wiimote/Src/SConscript
+++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript
@ -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)
--- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript
@ -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)
--- a/Source/UnitTests/SConscript
+++ b/Source/UnitTests/SConscript
@ -1,9 +1,6 @@
-# -*- python -*- 
+# -*- python -*-

 Import('env')
-import sys
-
-unitenv = env.Clone()

 files = [
 	"AudioJitTests.cpp",
@ -13,7 +10,6 @@ files = [

 libs = [
 	'dspcore', 'common',
-]
+	]

-unitenv.Append(LIBS = libs)
-unitenv.Program(env['binary_dir'] + 'tester', files)
+env.Program(env['binary_dir'] + 'tester', files, LIBS = libs)