fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 20:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

scons: Fix scons build.

Browse source
This commit is contained in:
José Fonseca 2012-06-11 19:38:07 +01:00
parent f3cdcb839f
commit ea606ee7b4
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scons/source_list.py
View file

@ -63,7 +63,7 @@ class SourceListParser(object):
self._error('not a variable definition') self._error('not a variable definition')
if op_pos > 0: if op_pos > 0:
if line[op_pos - 1] in [':', '+']: if line[op_pos - 1] in [':', '+', '?']:
op_pos -= 1 op_pos -= 1
else: else:
self._error('only =, :=, and += are supported') self._error('only =, :=, and += are supported')
@ -77,6 +77,9 @@ class SourceListParser(object):
self.symbol_table[sym] = val self.symbol_table[sym] = val
elif op == '+=': elif op == '+=':
self.symbol_table[sym] += ' ' + val self.symbol_table[sym] += ' ' + val
elif op == '?=':
if sym not in self.symbol_table:
self.symbol_table[sym] = val
def _parse_line(self, line): def _parse_line(self, line):
"""Parse a source list line.""" """Parse a source list line."""

2
src/glsl/Makefile.sources
View file

@ -1,5 +1,7 @@
# shared source lists for Makefile, SConscript, and Android.mk # shared source lists for Makefile, SConscript, and Android.mk
GLSL_SRCDIR ?= .
# libglcpp # libglcpp
LIBGLCPP_FILES = \ LIBGLCPP_FILES = \

2
src/mesa/sources.mak
View file

@ -1,5 +1,7 @@
### Lists of source files, included by Makefiles ### Lists of source files, included by Makefiles
SRCDIR ?= .
# this is part of MAIN_FILES # this is part of MAIN_FILES
MAIN_ES_FILES = \ MAIN_ES_FILES = \
$(SRCDIR)/main/api_exec_es1.c \ $(SRCDIR)/main/api_exec_es1.c \