X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=8c96817daefc04264a0a2863f2d1a02b9577272b;hb=7eb8b37735a32768487334664d95e98ad06f48db;hp=e7c10fcf527f680c1cadcb57416b0c236ba40e97;hpb=a3dbd412df99c7d19b1f81b3b9ec7d5c8a09d069;p=mesa.git

diff --git a/SConstruct b/SConstruct
index e7c10fcf527..8c96817daef 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,30 +29,36 @@ import common
 #######################################################################
 # Configuration options
 
+default_statetrackers = 'mesa'
+
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_statetrackers = 'mesa'
-	default_drivers = 'softpipe,failover,i915simple,i965simple'
+	default_drivers = 'softpipe,failover,i915simple,i965simple,trace'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-	default_statetrackers = 'none'
-	default_drivers = 'softpipe,i915simple'
-	default_winsys = 'none'
+	default_drivers = 'softpipe,i915simple,trace'
+	default_winsys = 'all'
 else:
 	default_drivers = 'all'
 	default_winsys = 'all'
 
 opts = Options('config.py')
 common.AddOptions(opts)
-opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers,
-                     ['mesa']))
+opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers,
+                     ['mesa', 'python']))
 opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell']))
+                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace']))
 opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel'])) 
+                     ['xlib', 'intel', 'gdi'])) 
+
+opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
 env = Environment(
-	options = opts, 
-	ENV = os.environ)
+	options = opts,
+	tools = ['gallium'],
+	toolpath = ['#scons'],	
+	ENV = os.environ,
+)
+
 Help(opts.GenerateHelpText(env))
 
 # replicate options values in local variables
@@ -64,12 +70,14 @@ platform = env['platform']
 
 # derived options
 x86 = machine == 'x86'
+ppc = machine == 'ppc'
 gcc = platform in ('linux', 'freebsd', 'darwin')
 msvc = platform in ('windows', 'winddk')
 
 Export([
 	'debug', 
 	'x86', 
+	'ppc', 
 	'dri', 
 	'llvm',
 	'platform',
@@ -80,22 +88,6 @@ Export([
 
 #######################################################################
 # Environment setup
-#
-# TODO: put the compiler specific settings in separate files
-# TODO: auto-detect as much as possible
-
-if platform == 'winddk':
-	env.Tool('winddk', ['.'])
-	
-	env.Append(CPPPATH = [
-		env['SDK_INC_PATH'],
-		env['DDK_INC_PATH'],
-		env['WDM_INC_PATH'],
-		env['CRT_INC_PATH'],
-	])
-
-common.generate(env)
-
 
 # Includes
 env.Append(CPPPATH = [
@@ -106,13 +98,6 @@ env.Append(CPPPATH = [
 ])
 
 
-# x86 assembly
-if x86:
-	if gcc:	
-		env.Append(CFLAGS = '-m32')
-		env.Append(CXXFLAGS = '-m32')
-
-
 # Posix
 if platform in ('posix', 'linux', 'freebsd', 'darwin'):
 	env.Append(CPPDEFINES = [
@@ -177,6 +162,6 @@ Export('env')
 
 SConscript(
 	'src/SConscript',
-	build_dir = common.make_build_dir(env),
+	build_dir = env['build'],
 	duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )