--- SConstruct.orig	2007-08-17 16:52:39.000000000 +0200
+++ SConstruct	2007-08-17 18:21:48.000000000 +0200
@@ -21,7 +21,7 @@
 
 VERSION = "0.2.4"
 
-import os, glob, sys, time, platform
+import os, glob, sys, time, platform, SCons.Util
 
 posix = os.name == 'posix'
 win32 = os.name == 'nt'
@@ -97,6 +97,11 @@
 
 env.SConsignFile()
 
+if os.environ.has_key('CFLAGS'):
+    env['CCFLAGS'] = SCons.Util.CLVar(os.environ['CFLAGS'])
+if os.environ.has_key('LDFLAGS'):
+    env['LINKFLAGS'] = SCons.Util.CLVar(os.environ['LDFLAGS'])
+
 ######################################
 #
 # build settings
@@ -158,7 +163,6 @@
 	#env['CXXFLAGS'] += ['--no-rtti']
 	if env['DEBUG'] == False:
 		env.Append(CCFLAGS=[
-			'-O3',
 			'-fomit-frame-pointer',
 			'-funroll-loops',
 			'-DNDEBUG',
@@ -195,7 +199,7 @@
 		'-W3',
 	])
 	if env['DEBUG'] == False:
-		env.Append(CCFLAGS=['-MT', '-O2' ])
+		env.Append(CCFLAGS=['-MT' ])
 	else:
 		env.Append(CCFLAGS=['-MTd', '-Zi' ])
 
@@ -404,12 +408,6 @@
 			print "Libraries and headers for either ALSA, OSS, JACK or CoreAudio are required for building."
 			Exit(1)
 	
-	if conf.CheckCPUFlag('sse'):
-		env['SSE'] = True
-	if conf.CheckCPUFlag('sse2'):
-		env['SSE'] = False
-		env['SSE2'] = True
-	
 	if env['LUNAR'] == True: # user wants to build lunar
 		# needs LLVM for that
 		wantversion = '1.9'