KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl/Makefile.sources: Correct BUILTIN_COMPILER_CXX_FILES 

Squashed with two reverts:

Revert "android: Update for builtin_stubs.cpp move"

This reverts commit c0def90ede.

Revert "scons: Update for builtin_stubs.cpp"

This reverts commit 8ac4b82699.

Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
Tested-on-Android-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Matt Turner 2013-01-17 23:28:42 -08:00
parent 2a71054396
commit 952e6e9f3b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/Android.mk
View File

@ -58,7 +58,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(LIBGLCPP_FILES) \
$(LIBGLSL_FILES) \
$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
$(BUILTIN_COMPILER_CXX_FILES) \
$(GLSL_COMPILER_CXX_FILES)
LOCAL_C_INCLUDES := \

2
src/glsl/Makefile.sources
View File

@ -100,7 +100,7 @@ GLSL_COMPILER_CXX_FILES = \
# builtin_stubs.cpp, is used.
BUILTIN_COMPILER_CXX_FILES = \
$(GLSL_SRCDIR)/builtin_stubs.cpp
$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp
BUILTIN_COMPILER_GENERATED_CXX_FILES = \
$(GLSL_BUILDDIR)/glsl_lexer.cpp \

5
src/glsl/SConscript
View File

@ -76,9 +76,8 @@ else:
builtin_compiler = env.Program(
target = 'builtin_compiler/builtin_compiler',
source = compiler_objs + glsl_sources + [
'builtin_compiler/builtin_stubs.cpp',
]
source = compiler_objs + glsl_sources + \
source_lists['BUILTIN_COMPILER_CXX_FILES'],
)
# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll