--- SConstruct	Thu Nov  3 09:45:12 2005
+++ SConstruct	Wed Nov  9 23:21:40 2005
@@ -1,6 +1,12 @@
 import os, errno, SCons
 from time import gmtime, strftime
 
+#-----------------#
+# FreeBSD Options #
+#-----------------#
+LOCALBASE = os.environ['LOCALBASE']
+X11BASE = os.environ['X11BASE']
+
 #---------------#
 # Build Options #
 #---------------#
@@ -15,11 +21,16 @@
 # Create Build Environment #
 #--------------------------#
 env = Environment(ENV = os.environ,
-                  CPPPATH = ['#include'],
+                  CPPPATH = ['#include',LOCALBASE + '/include', LOCALBASE + '/include/AL', X11BASE + '/include'],
 		  CCFLAGS = ['-Wall', '-Wno-non-virtual-dtor'],
-		  LIBPATH = ['.', '#lib'],
+		  LIBPATH = ['.', '#lib', LOCALBASE + '/lib', X11BASE + '/lib'],
+		  LINKFLAGS = ['-pthread'],
 		  options = opts)
 
+env.Replace(CC = os.environ['CC'])
+env.Replace(CXX = os.environ['CXX'])
+env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
+
 #--------------#
 # Save Options #
 #--------------#
@@ -122,7 +133,7 @@
         print 'You do not have the %s library installed. Exiting.' % lib
         Exit(1)
 
-SDL_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_net.h']
+SDL_headers = ['GL/gl.h', 'GL/glu.h', 'SDL11/SDL.h', 'SDL11/SDL_image.h', 'SDL11/SDL_net.h']
 
 for header in SDL_headers:
     if not conf.CheckCXXHeader(header):
@@ -135,7 +146,7 @@
 # Debug/release #
 #---------------#
 if not int(release):
-    env.Append(CCFLAGS = ['-g', '-O2'])
+    env.Append(CCFLAGS = ['-g'])
 
 #---------#
 # Version #
