OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automake: Merge *_CXX_FILES variables in the glsl build.

Browse Source 
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt
2012-11-06 23:18:38 -08:00
committed by Chad Versace
parent 34d4216e64
commit a665cf1226
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/Android.mk
View File

@@ -36,8 +36,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LIBGLCPP_FILES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_FILES) \ $(LIBGLSL_FILES)
$(LIBGLSL_CXX_FILES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
external/astl/include \ external/astl/include \
@@ -59,7 +58,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LIBGLCPP_FILES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_FILES) \ $(LIBGLSL_FILES) \
$(LIBGLSL_CXX_FILES) \
$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \ $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
$(GLSL_COMPILER_CXX_FILES) $(GLSL_COMPILER_CXX_FILES)

1
src/glsl/Makefile.am
View File

@@ -43,7 +43,6 @@ libglsl_la_SOURCES = \
glsl_lexer.ll \ glsl_lexer.ll \
glsl_parser.cc \ glsl_parser.cc \
$(LIBGLSL_FILES) \ $(LIBGLSL_FILES) \
$(LIBGLSL_CXX_FILES) \
builtin_function.cpp builtin_function.cpp
libglsl_la_LIBADD = glcpp/libglcpp.la libglsl_la_LIBADD = glcpp/libglcpp.la

9
src/glsl/Makefile.sources
View File

@@ -15,10 +15,6 @@ LIBGLCPP_GENERATED_FILES = \
# libglsl # libglsl
LIBGLSL_FILES = \ LIBGLSL_FILES = \
$(GLSL_SRCDIR)/strtod.c \
$(GLSL_SRCDIR)/ralloc.c
LIBGLSL_CXX_FILES = \
$(GLSL_SRCDIR)/ast_expr.cpp \ $(GLSL_SRCDIR)/ast_expr.cpp \
$(GLSL_SRCDIR)/ast_function.cpp \ $(GLSL_SRCDIR)/ast_function.cpp \
$(GLSL_SRCDIR)/ast_to_hir.cpp \ $(GLSL_SRCDIR)/ast_to_hir.cpp \
@@ -85,7 +81,10 @@ LIBGLSL_CXX_FILES = \
$(GLSL_SRCDIR)/opt_structure_splitting.cpp \ $(GLSL_SRCDIR)/opt_structure_splitting.cpp \
$(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
$(GLSL_SRCDIR)/opt_tree_grafting.cpp \ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \
$(GLSL_SRCDIR)/s_expression.cpp $(GLSL_SRCDIR)/s_expression.cpp \
$(GLSL_SRCDIR)/strtod.c \
$(GLSL_SRCDIR)/ralloc.c \
$()
# glsl_compiler # glsl_compiler

2
src/glsl/SConscript
View File

@@ -46,7 +46,7 @@ glsl_sources = [
source_lists = env.ParseSourceList('Makefile.sources') source_lists = env.ParseSourceList('Makefile.sources')
# add non-generated sources # add non-generated sources
for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES', 'LIBGLSL_CXX_FILES'): for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'):
glsl_sources += source_lists[l] glsl_sources += source_lists[l]
if env['msvc']: if env['msvc']:

1
src/mesa/libdricore/Makefile.am
View File

@@ -38,7 +38,6 @@ libdricore@VERSION@_la_SOURCES = \
$(LIBGLCPP_GENERATED_FILES) \ $(LIBGLCPP_GENERATED_FILES) \
$(LIBGLCPP_FILES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_FILES) \ $(LIBGLSL_FILES) \
$(LIBGLSL_CXX_FILES) \
$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
$(top_builddir)/src/glsl/builtin_function.cpp $(top_builddir)/src/glsl/builtin_function.cpp
libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 libdricore@VERSION@_la_LDFLAGS = -version-number 1:0