diff --git a/SConstruct b/SConstruct
index 4089322d7e..31bf13d603 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,29 +5,41 @@ import sys
 dolphin_version = '1.04'
 Export('dolphin_version')
 
-warnings = ' -Wall -Wwrite-strings -Wfloat-equal -Wshadow -Wpointer-arith -Wpacked -Wno-conversion'
+warnings = [
+	'all',
+	'write-strings',
+	'float-equal',
+	'shadow',
+	'pointer-arith',
+	'packed',
+	'no-conversion',
+	#'unreachable-code',
+	]
+compileFlags = [
+	'-g',
+	'-O3',
+	'-fno-strict-aliasing',
+	'-fPIC',
+	'-msse2',
+	'-D_FILE_OFFSET_BITS=64',
+	'-D_LARGEFILE_SOURCE',
+	]
+compileFlags += [ '-W' + warning for warning in warnings ]
+#compileFlags += [ '-DLOGGING' ]
+#compileFlags += [ '-fomit-frame-pointer' ]
+if sys.platform == 'darwin':
+	compileFlags += [ '-I/opt/local/include' ]
 
-nonactive_warnings = '-Wunreachable-code'
-
-ccflags = '-g -O3 -fno-strict-aliasing -fPIC -msse2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE' + warnings
-#ccflags += ' -DLOGGING'
-
-if sys.platform == 'darwin':         
-	ccflags += ' -I/opt/local/include'
-
-if False:
-	ccflags += ' -fomit-frame-pointer'
-
-include_paths = ["../../../Core/Common/Src",
-                 "../../../Core/DiscIO/Src",
-                 "../../../PluginSpecs",
-                 "../../../",
-                 "../../../Core/Core/Src",
-                 "../../../Core/DebuggerWX/src",
-                 "../../../../Externals/Bochs_disasm",
-                 "../../../Core/VideoCommon/Src",
-#                 "../../../Plugins/Plugin_VideoOGL/Src/Windows",
-                 ]
+include_paths = [
+	'../../../Core/Common/Src',
+	'../../../Core/DiscIO/Src',
+	'../../../PluginSpecs',
+	'../../../',
+	'../../../Core/Core/Src',
+	'../../../Core/DebuggerWX/src',
+	'../../../../Externals/Bochs_disasm',
+	'../../../Core/VideoCommon/Src',
+	]
 
 dirs = [
 	"Source/Core/Common/Src",
@@ -38,44 +50,43 @@ dirs = [
 	"Source/Core/VideoCommon/Src",
 	"Source/Plugins/Plugin_VideoOGL/Src",
 	"Source/Plugins/Plugin_DSP_HLE/Src",
-#	"Source/Plugins/Plugin_DSP_LLE/Src",
+	#"Source/Plugins/Plugin_DSP_LLE/Src",
 	"Source/Plugins/Plugin_PadSimple/Src",
 	"Source/Plugins/Plugin_nJoy_SDL/Src",
 	"Source/Core/DolphinWX/src",
 	]
 
 builders = {}
-if sys.platform == 'darwin':         
+if sys.platform == 'darwin':
 	from plistlib import writePlist
-	def create_plist(target, source, env):
+	def createPlist(target, source, env):
 		properties = {}
-		for src_node in source:
-			properties.update(src_node.value)
-		for dst_node in target:
-			writePlist(properties, str(dst_node))
-	builders['Plist'] = Builder(action = create_plist)
+		for srcNode in source:
+			properties.update(srcNode.value)
+		for dstNode in target:
+			writePlist(properties, str(dstNode))
+	builders['Plist'] = Builder(action = createPlist)
 
 lib_paths = include_paths
 
-env = Environment(CC="gcc", 
-                  CXX="g++",
-                  CCFLAGS=ccflags, 
-                  CXXFLAGS=ccflags,
-                  CPPPATH=include_paths, 
-                  LIBPATH=lib_paths,
-                  ENV={'PATH' : os.environ['PATH'],
-                       'HOME' : os.environ['HOME']},
-                  BUILDERS = builders,
-                  )
+env = Environment(
+	CC = "gcc",
+	CXX = "g++",
+	CCFLAGS = compileFlags,
+	CXXFLAGS = compileFlags,
+	CPPPATH = include_paths,
+	LIBPATH = lib_paths,
+	ENV = {
+		'PATH' : os.environ['PATH'],
+		'HOME' : os.environ['HOME']
+		},
+	BUILDERS = builders,
+	)
 
 Export('env')
 
-builddir = "build"
-
-for dir in dirs:
+for subdir in dirs:
 	SConscript(
-		dir + os.sep + "SConscript",
-#		build_dir = builddir + os.sep + dir,
+		subdir + os.sep + 'SConscript',
 		duplicate = 0
 		)
-
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 52a4fe3335..29be81fbc9 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -26,5 +26,5 @@ files = ["ABI.cpp",
 		 ]
 		 
 env_common = env.Copy()
-env_common.Append(CXXFLAGS = " -fPIC ")
+env_common.Append(CXXFLAGS = [ '-fPIC' ])
 env_common.StaticLibrary("common", files)