summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2012-05-23 17:26:20 -0700
committerVinson Lee <vlee@freedesktop.org>2012-05-24 18:49:40 -0700
commit5cf693266faebd1fc130709fd7e7b2452bbd156c (patch)
treec93463f84490aba3871068e89ab413b0b7495581
parent33e7db9a1dafdcf5c7c745180831403e0485544d (diff)
downloadexternal_mesa3d-5cf693266faebd1fc130709fd7e7b2452bbd156c.zip
external_mesa3d-5cf693266faebd1fc130709fd7e7b2452bbd156c.tar.gz
external_mesa3d-5cf693266faebd1fc130709fd7e7b2452bbd156c.tar.bz2
scons: Fix SCons build infrastructure for FreeBSD.
This patch gets the FreeBSD SCons build working again. The build still fails though. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--common.py2
-rw-r--r--src/SConscript2
-rw-r--r--src/gallium/SConscript2
-rw-r--r--src/gallium/winsys/sw/xlib/SConscript2
4 files changed, 4 insertions, 4 deletions
diff --git a/common.py b/common.py
index f0b1ccc..6121a41 100644
--- a/common.py
+++ b/common.py
@@ -89,7 +89,7 @@ def AddOptions(opts):
opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
opts.Add(EnumOption('platform', 'target platform', host_platform,
- allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8', 'haiku')))
+ allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux', 'sunos', 'windows')))
opts.Add(BoolOption('embedded', 'embedded build', 'no'))
opts.Add('toolchain', 'compiler toolchain', default_toolchain)
opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
diff --git a/src/SConscript b/src/SConscript
index e4cda2f..3d00878 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,7 +22,7 @@ SConscript('mesa/SConscript')
SConscript('mapi/vgapi/SConscript')
if not env['embedded']:
- if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'windows'):
+ if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
SConscript('glx/SConscript')
if env['platform'] not in ['darwin', 'haiku', 'sunos']:
SConscript('egl/main/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index e212ed1..f281f4c 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -124,7 +124,7 @@ SConscript([
])
if not env['embedded']:
- if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
+ if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
SConscript([
'targets/egl-static/SConscript'
])
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index e9c2740..7b1cc8c 100644
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -4,7 +4,7 @@
Import('*')
-if env['platform'] in ('cygwin', 'linux', 'sunos'):
+if env['platform'] in ('cygwin', 'freebsd', 'linux', 'sunos'):
env = env.Clone()