From a2b1f829cb1064ff57ee0a3f6d41a7fd1b672dab Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Mon, 19 Jul 2010 03:42:37 +0000 Subject: 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 --- Source/Plugins/Plugin_VideoSoftware/Src/SConscript | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/SConscript') diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 7ee899e44d..f633dfba27 100644 --- 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' - ] - -gfxenv = env.Clone() +libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ] -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) -- cgit v1.2.3