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

Externals/Bochs_disasm/SConscript

@@ -1,4 +1,4 @@
-# -*- python -*- 
+# -*- python -*-
 
 Import('env')
 import sys

Externals/LZO/SConscript

@@ -1,4 +1,4 @@
-# -*- python -*- 
+# -*- python -*-
 
 Import('env')
 

Externals/Lua/SConscript

@@ -1,44 +1,44 @@
-# -*- python -*- 
+# -*- python -*-
 
-import sys
 Import('env')
+import sys
 
 luaenv = env.Clone()
 
 if not sys.platform == 'win32':
-    luaenv['CPPDEFINES'].append('LUA_USE_LINUX')	# Also works for OS X
+	luaenv['CPPDEFINES'].append('LUA_USE_LINUX')	# Also works for OS X
 
 files = [
-    'lapi.c',
-    'lauxlib.c',
-    'lbaselib.c',
-    'lcode.c',
-    'ldblib.c',
-    'ldebug.c',
-    'ldo.c',
-    'ldump.c',
-    'lfunc.c',
-    'lgc.c',
-    'linit.c',
-    'liolib.c',
-    'llex.c',
-    'lmathlib.c',
-    'lmem.c',
-    'loadlib.c',
-    'lobject.c',
-    'lopcodes.c',
-    'loslib.c',
-    'lparser.c',
-    'lstate.c',
-    'lstring.c',
-    'lstrlib.c',
-    'ltable.c',
-    'ltablib.c',
-    'ltm.c',
-    'lundump.c',
-    'lvm.c',
-    'lzio.c',
-    'print.c',
-    ]
+	'lapi.c',
+	'lauxlib.c',
+	'lbaselib.c',
+	'lcode.c',
+	'ldblib.c',
+	'ldebug.c',
+	'ldo.c',
+	'ldump.c',
+	'lfunc.c',
+	'lgc.c',
+	'linit.c',
+	'liolib.c',
+	'llex.c',
+	'lmathlib.c',
+	'lmem.c',
+	'loadlib.c',
+	'lobject.c',
+	'lopcodes.c',
+	'loslib.c',
+	'lparser.c',
+	'lstate.c',
+	'lstring.c',
+	'lstrlib.c',
+	'ltable.c',
+	'ltablib.c',
+	'ltm.c',
+	'lundump.c',
+	'lvm.c',
+	'lzio.c',
+	'print.c',
+	]
 
 luaenv.StaticLibrary(env['local_libs'] + "lua", files)

Externals/MemcardManager/SConscript

@@ -1,14 +1,13 @@
 # -*- python -*-
 
 Import('env')
-import sys
 
 if not env['HAVE_WX']:
 	Return()
 
-wxenv = env.Clone()
-
 files = [
+	'src/mcmMain.cpp',
+	'src/MCMdebug.cpp',
 	]
 
 libs = [
@@ -16,18 +15,6 @@ libs = [
 	'common',
 	]
 
-if wxenv['HAVE_WX']:
-	files += [
-		'src/mcmMain.cpp',
-		'src/MCMdebug.cpp',
-		]
-
-LIBS = libs
-
-wxenv.Append(
-	LIBS = libs
-	)
-
 exeGUI = env['binary_dir'] + 'MemcardManager'
 
-wxenv.Program(exeGUI, files)
+env.Program(exeGUI, files, LIBS = env['LIBS'] + libs)

Externals/SDL/SConscript

@@ -1,54 +1,13 @@
-# -*- python -*- 
+# -*- python -*-
 
-import sys
 Import('env')
+import sys
 
 files = [
 	'src/SDL.c',
 	'src/SDL_error.c',
 	'src/SDL_fatal.c',
-	#'src/audio/SDL_audio.c',
-	#'src/audio/SDL_audiocvt.c',
-	#'src/audio/SDL_audiodev.c',
-	#'src/audio/SDL_mixer.c',
-	#'src/audio/SDL_mixer_MMX.c',
-	#'src/audio/SDL_mixer_MMX_VC.c',
-	#'src/audio/SDL_mixer_m68k.c',
-	#'src/audio/SDL_wave.c',
-	#'src/cdrom/SDL_cdrom.c',
-	#'src/cpuinfo/SDL_cpuinfo.c',
-	#'src/events/SDL_active.c',
-	#'src/events/SDL_events.c',
-	#'src/events/SDL_expose.c',
-	#'src/events/SDL_keyboard.c',
-	#'src/events/SDL_mouse.c',
-	#'src/events/SDL_quit.c',
-	#'src/events/SDL_resize.c',
-	#'src/file/SDL_rwops.c',
 	'src/joystick/SDL_joystick.c',
-	#'src/stdlib/SDL_getenv.c',
-	#'src/stdlib/SDL_iconv.c',
-	#'src/stdlib/SDL_malloc.c',
-	#'src/stdlib/SDL_qsort.c',
-	#'src/stdlib/SDL_stdlib.c',
-	#'src/thread/SDL_thread.c',
-	#'src/timer/SDL_timer.c',
-	#'src/video/SDL_RLEaccel.c',
-	#'src/video/SDL_blit.c',
-	#'src/video/SDL_blit_0.c',
-	#'src/video/SDL_blit_1.c',
-	#'src/video/SDL_blit_A.c',
-	#'src/video/SDL_blit_N.c',
-	#'src/video/SDL_bmp.c',
-	#'src/video/SDL_cursor.c',
-	#'src/video/SDL_gamma.c',
-	#'src/video/SDL_pixels.c',
-	#'src/video/SDL_stretch.c',
-	#'src/video/SDL_surface.c',
-	#'src/video/SDL_video.c',
-	#'src/video/SDL_yuv.c',
-	#'src/video/SDL_yuv_mmx.c',
-	#'src/video/SDL_yuv_sw.c',
 	]
 
 if sys.platform == 'darwin':

Externals/SFML/src/SConscript

@@ -1,9 +1,8 @@
-# -*- python -*- 
+# -*- python -*-
 
 Import('env')
-import sys
 
-files = [ 
+files = [
 	"SFML/Network/Ftp.cpp",
 	"SFML/Network/Http.cpp",
 	"SFML/Network/IPAddress.cpp",

Externals/SOIL/SConscript

@@ -1,6 +1,6 @@
 # -*- python -*-
+
 Import('env')
-import sys
 
 files = [
 	'image_DXT.c',

Externals/WiiUseSrc/Src/SConscript

@@ -1,24 +1,28 @@
-# -*- python -*- 
+# -*- python -*-
 
-import sys
 Import('env')
+import sys
 
-if (sys.platform == 'linux2' and env['HAVE_BLUEZ'] != 1):
-    env['HAVE_WIIUSE'] = 0
-    Return()
-
-files = [
-        "io.c",
-        "ir.c",
-        "wiiuse.c",
-	]
-
-if sys.platform == 'linux2' and env['HAVE_BLUEZ']:
-	files += [ "io_nix.c", ]
-
-if sys.platform == 'darwin':
-	files += [ "io_osx.m", ]
-
-env.StaticLibrary(env['local_libs'] + "wiiuse", files)
+if (sys.platform == 'linux2' and not env['HAVE_BLUEZ']) or \
+	(not sys.platform == 'darwin' and
+	not sys.platform == 'linux2' and
+	not sys.platform == 'win32'):
+	env['HAVE_WIIUSE'] = 0
+	Return()
 
 env['HAVE_WIIUSE'] = 1
+
+files = [
+	"io.c",
+	"ir.c",
+	"wiiuse.c",
+	]
+
+if sys.platform == 'darwin':
+	files += [ "io_osx.m" ]
+elif sys.platform == 'linux2':
+	files += [ "io_nix.c" ]
+elif sys.platform == 'win32':
+	files += [ "io_win.c" ]
+
+env.StaticLibrary(env['local_libs'] + "wiiuse", files)

Externals/zlib/SConscript

@@ -1,4 +1,4 @@
-# -*- python -*- 
+# -*- python -*-
 
 Import('env')