diff --git a/SConstruct b/SConstruct
index b2475ad3..4e7b18ad 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,7 +4,6 @@ import sys
 # XXX path separator fixed right now
 opts = Options()
 opts.AddOptions(
-  BoolOption('DEBUG', 'Build with debugging information', 1),
   #BoolOption('PSS_STYLE', 'Path separator style', 1),
   BoolOption('LSB_FIRST', 'Least significant byte first?', None),
   BoolOption('FRAMESKIP', 'Enable frameskipping', 0),
@@ -12,6 +11,8 @@ opts.AddOptions(
 )
 
 env = Environment(options = opts)
+# Default compiler flags:
+env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
 
 if os.environ.has_key('PLATFORM'):
   env.Replace(PLATFORM = os.environ['PLATFORM'])
@@ -20,7 +21,7 @@ if os.environ.has_key('CC'):
 if os.environ.has_key('CXX'):
   env.Replace(CXX = os.environ['CXX'])
 if os.environ.has_key('WINDRES'):
-  env.Append(WINDRES = os.environ['WINDRES'])
+  env.Replace(WINDRES = os.environ['WINDRES'])
 if os.environ.has_key('CFLAGS'):
   env.Append(CCFLAGS = os.environ['CFLAGS'])
 if os.environ.has_key('LDFLAGS'):
@@ -29,26 +30,18 @@ if os.environ.has_key('LDFLAGS'):
 print "platform: ", env['PLATFORM']
 
 # special flags for cygwin
-# we have to do this here so that the function and lib checks will go through
-# mingw
+# we have to do this here so that the function and lib checks will go through mingw
 if env['PLATFORM'] == 'cygwin':
   env.Append(CCFLAGS = " -mno-cygwin")
   env.Append(LINKFLAGS = " -mno-cygwin")
   env['LIBS'] = ['wsock32'];
 
-conf = Configure(env)
 if env['PLATFORM'] == 'win32':
-  conf.env.Append(CPPPATH = [".", "drivers/win/", "drivers/common/", "drivers/", "drivers/win/zlib", "drivers/win/directx"])
-  conf.env.Append(CPPDEFINES = ["PSS_STYLE=2", "WIN32", "_USE_SHARED_MEMORY_", "NETWORK", "FCEUDEF_DEBUGGER", "NOMINMAX", "NEED_MINGW_HACKS", "_WIN32_IE=0x0600"])
-  conf.env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"])
-  if env.has_key('DEBUG'):
-    if env['DEBUG']:
-      conf.env.Append(CCFLAGS = " -g")
-      conf.env.Append(CPPDEFINES = ["_DEBUG"])
-      conf.env.Append(CCFLAGS = " -O3 -Wall")
-    else: # Should we do this?
-      conf.env.Append(CCFLAGS = " -O3 -fomit-frame-pointer")
+  env.Append(CPPPATH = [".", "drivers/win/", "drivers/common/", "drivers/", "drivers/win/zlib", "drivers/win/directx"])
+  env.Append(CPPDEFINES = ["PSS_STYLE=2", "WIN32", "_USE_SHARED_MEMORY_", "NETWORK", "FCEUDEF_DEBUGGER", "NOMINMAX", "NEED_MINGW_HACKS", "_WIN32_IE=0x0600"])
+  env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"])
 else:
+  conf = Configure(env)
   if not conf.CheckLib('SDL'):
     print 'Did not find libSDL or SDL.lib, exiting!'
     Exit(1)
@@ -59,26 +52,50 @@ else:
     conf.env.Append(CCFLAGS = " -DHAVE_ASPRINTF")
   if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c++', autoadd=1):
     conf.env.Append(CCFLAGS = " -DOPENGL")
+  conf.env.Append(CPPDEFINES = ['PSS_STYLE=1'])
+  env = conf.Finish()
   # parse SDL cflags/libs
   env.ParseConfig('sdl-config --cflags --libs')
-  conf.env.Append(CPPDEFINES = " PSS_STYLE=1")
 
-env = conf.Finish()
-
-# option specified
+# Build for this system's endianness, if not overriden
 if env.has_key('LSB_FIRST'):
   if env['LSB_FIRST']:
     env.Append(CPPDEFINES = ['LSB_FIRST'])
-# option not specified, check host system
 elif sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
   env.Append(CPPDEFINES = ['LSB_FIRST'])
 
 if env['FRAMESKIP']:
   env.Append(CPPDEFINES = ['FRAMESKIP'])
 
-print "CPPDEFINES:",env['CPPDEFINES']
-print "CCFLAGS:",env['CCFLAGS']
-#print "LIBS:",env['LIBS']
-Export('env')
+print "base CPPDEFINES:",env['CPPDEFINES']
+print "base CCFLAGS:",env['CCFLAGS']
 
-SConscript(['src/SConscript'])
+# Split into release and debug environments:
+#release_env = env.Clone(CCFLAGS = ['-O3', '-fomit-frame-pointer'], CPPDEFINES=["NDEBUG"])
+#debug_env = env.Clone(CCFLAGS = ['-O', '-g'], CPPDEFINES=["_DEBUG"])
+#
+#SConscript('src/SConscript', build_dir='release', exports={'env':release_env})
+#SConscript('src/SConscript', build_dir='release', exports={'env':debug_env})
+Export('env')
+SConscript('src/SConscript')
+
+# Install rules
+exe_suffix = ''
+if env['PLATFORM'] == 'win32':
+  exe_suffix = '.exe'
+#fceux_r_src = 'src/release/fceux' + exe_suffix
+#fceux_r_dst = 'bin/fceuxREL' + exe_suffix
+#fceux_d_src = 'src/debug/fceux' + exe_suffix
+#fceux_d_dst = 'bin/fceuxDBG' + exe_suffix
+fceux_src = 'src/fceux' + exe_suffix
+fceux_dst = 'bin/fceux' + exe_suffix
+
+fceux_h_src = 'src/drivers/win/help/fceux.chm'
+fceux_h_dst = 'bin/fceux.chm'
+
+#env.Command(fceux_r_dst, fceux_r_src, [Copy(fceux_r_dst, fceux_r_src)])
+#env.Command(fceux_d_dst, fceux_d_src, [Copy(fceux_d_dst, fceux_d_src)])
+env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)])
+#env.Alias("install", [fceux_r_dst, fceux_d_dst, fceux_h_dst])
+env.Command(fceux_dst, fceux_src, [Copy(fceux_dst, fceux_src)])
+env.Alias("install", [fceux_dst, fceux_h_dst])
diff --git a/debian-crossbuild b/debian-crossbuild
index 705e83e2..f0623563 100644
--- a/debian-crossbuild
+++ b/debian-crossbuild
@@ -2,4 +2,4 @@
 if [ -f /usr/bin/i586-mingw32msvc-windres ]; then HOST=i586-mingw32msvc
 else HOST=i586-mingw32
 fi
-PLATFORM=win32 CC=${HOST}-gcc CXX=${HOST}-g++ WRC=${HOST}-windres WINDRES=${HOST}-windres CFLAGS=-Wno-write-strings scons $@
+PLATFORM=win32 CC=${HOST}-gcc CXX=${HOST}-g++ WRC=${HOST}-windres WINDRES=${HOST}-windres scons $@