Fix an issue that made it so that the emulator could not be resized in the nowx build on linux. Also some code cleanup in the OpenGL and Software plugins.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5889 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 13 insertions, 25 deletions

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
index cceb2914d9..6a5b762b42 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript
@@ -1,11 +1,7 @@
 # -*- python -*-
 
 Import('env')
-# can we import path in one place?
 import sys
-sys.path.append(env['base_dir']+'SconsTests')
-import utils
-import platform
 
 name = "Plugin_VideoSoftware"
 
@@ -25,38 +21,30 @@ files = [
 	'Rasterizer.cpp',
 	'RasterFont.cpp',
 	'Renderer.cpp',
-        'SetupUnit.cpp',
-        'Statistics.cpp',
-        'Tev.cpp',
-        'TextureEncoder.cpp',
-        'TextureSampler.cpp',
-        'TransformUnit.cpp',
-        'VertexFormatConverter.cpp',
-        'VertexLoader.cpp',
-        'VideoConfig.cpp',
-        'XFMemLoader.cpp',
-	]
-linkFlags = [
+	'SetupUnit.cpp',
+	'Statistics.cpp',
+	'Tev.cpp',
+	'TextureEncoder.cpp',
+	'TextureSampler.cpp',
+	'TransformUnit.cpp',
+	'VertexFormatConverter.cpp',
+	'VertexLoader.cpp',
+	'VideoConfig.cpp',
+	'XFMemLoader.cpp',
 	]
+
 libs = [
 	'videocommon', 'GLEW', 'SOIL', 'common'
 	]
 
 gfxenv = env.Clone()
 
-if sys.platform == 'win32':
-        files += [ 'Win32.cpp' ]
-
 if sys.platform == 'darwin':
 	files += [ 'cocoaGL.m', ]
 
 if sys.platform == 'win32':
-	files += [
-		'Win32.cpp'
-		]
-	libs += [
-		env['base_dir'] + '/Externals/Cg/'
-		]	
+	files += [ 'Win32.cpp' ]
+	libs += [ env['base_dir'] + '/Externals/Cg/' ]	
 	gfxenv['CPPPATH'] += libs
 	
 gfxenv.SharedLibrary(