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>tags/instanced_arrays-v2
| @@ -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')) | |||
| @@ -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') | |||
| @@ -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' | |||
| ]) | |||
| @@ -4,7 +4,7 @@ | |||
| Import('*') | |||
| if env['platform'] in ('cygwin', 'linux', 'sunos'): | |||
| if env['platform'] in ('cygwin', 'freebsd', 'linux', 'sunos'): | |||
| env = env.Clone() | |||