Commit 8c00fe39 authored by Giuseppe Bilotta's avatar Giuseppe Bilotta Committed by Brian Paul

scons: whitespace cleanup

This text transformation was done automatically via the following shell
command:

$ find -name SCons\* -exec sed -i s/\\s\\+$// '{}' \;
Signed-off-by: 's avatarGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Reviewed-by: 's avatarBrian Paul <brianp@vmware.com>
parent 8c29bba2
#######################################################################
# Top-level SConstruct
#
# For example, invoke scons as
# For example, invoke scons as
#
# scons build=debug llvm=yes machine=x86
#
......@@ -12,13 +12,13 @@
# build='debug'
# llvm=True
# machine='x86'
#
#
# Invoke
#
# scons -h
#
# to get the full list of options. See scons manpage for more info.
#
#
import os
import os.path
......@@ -36,7 +36,7 @@ common.AddOptions(opts)
env = Environment(
options = opts,
tools = ['gallium'],
toolpath = ['#scons'],
toolpath = ['#scons'],
ENV = os.environ,
)
......@@ -53,7 +53,7 @@ else:
print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
print
print ' scons %s' % ' '.join(targets)
print
print
COMMAND_LINE_TARGETS.append(targets)
......@@ -90,8 +90,8 @@ env.AlwaysBuild(check)
#######################################################################
# Invoke host SConscripts
#
# Invoke host SConscripts
#
# For things that are meant to be run on the native host build machine, instead
# of the target machine.
#
......
......@@ -51,7 +51,7 @@ glsl_sources = [
glcpp_parser[0],
glsl_lexer,
glsl_parser[0],
]
]
# parse Makefile.sources
source_lists = env.ParseSourceList('Makefile.sources')
......
Import('env')
#
#
# Auxiliary modules
#
......
......@@ -13,15 +13,15 @@ env = env.Clone()
env.MSVC2013Compat()
env.CodeGenerate(
target = 'indices/u_indices_gen.c',
script = 'indices/u_indices_gen.py',
target = 'indices/u_indices_gen.c',
script = 'indices/u_indices_gen.py',
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
env.CodeGenerate(
target = 'indices/u_unfilled_gen.c',
script = 'indices/u_unfilled_gen.py',
target = 'indices/u_unfilled_gen.c',
script = 'indices/u_unfilled_gen.py',
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
......@@ -35,7 +35,7 @@ env.CodeGenerate(
env.Depends('util/u_format_table.c', [
'#src/gallium/auxiliary/util/u_format_parse.py',
'util/u_format_pack.py',
'util/u_format_pack.py',
])
source = env.ParseSourceList('Makefile.sources', [
......
......@@ -11,7 +11,7 @@ if env['suncc']:
env.Append(CPPDEFINES = [
'HAVE_STDINT_H',
])
env.Prepend(CPPPATH = [
'include',
])
......
......@@ -12,7 +12,7 @@ env.Append(CPPPATH = [
env.AppendUnique(CPPDEFINES = [
'_GDI32_', # prevent wgl* being declared __declspec(dllimport)
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
])
if not env['gles']:
......
......@@ -36,7 +36,7 @@ if env['gcc'] and env['machine'] != 'x86_64':
sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
else:
sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
drivers += [trace, rbug]
env['no_import_lib'] = 1
......
......@@ -6,7 +6,7 @@ env.Prepend(LIBS = [mesautil, gallium])
env.Prepend(LIBPATH = [graw.dir])
env.Prepend(LIBS = ['graw'])
if env['platform'] in ('freebsd8', 'sunos'):
env.Append(LIBS = ['m'])
......
......@@ -109,14 +109,14 @@ env.CodeGenerate(
)
env.CodeGenerate(
target = 'indirect_size.c',
target = 'indirect_size.c',
script = GLAPI + 'gen/glX_proto_size.py',
source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m size_c --only-set > $TARGET'
)
env.CodeGenerate(
target = 'indirect_init.c',
target = 'indirect_init.c',
script = GLAPI + 'gen/glX_proto_send.py',
source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET'
......
......@@ -40,7 +40,7 @@ def mapi_objects(env, printer, mode):
'#/src',
'#/src/mapi',
]
cppdefines = mapi_defines[mode] + [
'MAPI_ABI_HEADER=\\"%s\\"' % (header_name),
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment