diff options
| -rw-r--r-- | src/glsl/Android.mk | 18 | ||||
| -rw-r--r-- | src/glsl/Makefile | 16 | ||||
| -rw-r--r-- | src/glsl/Makefile.sources | 18 | ||||
| -rw-r--r-- | src/glsl/SConscript | 6 |
4 files changed, 29 insertions, 29 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk index d7d17dd6d9a..754f3ccedca 100644 --- a/src/glsl/Android.mk +++ b/src/glsl/Android.mk @@ -34,9 +34,9 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBGLCPP_SOURCES) \ - $(LIBGLSL_SOURCES) \ - $(LIBGLSL_CXX_SOURCES) + $(LIBGLCPP_FILES) \ + $(LIBGLSL_FILES) \ + $(LIBGLSL_CXX_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ @@ -55,11 +55,11 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBGLCPP_SOURCES) \ - $(LIBGLSL_SOURCES) \ - $(LIBGLSL_CXX_SOURCES) \ - $(BUILTIN_COMPILER_CXX_SOURCES) \ - $(GLSL_COMPILER_CXX_SOURCES) + $(LIBGLCPP_FILES) \ + $(LIBGLSL_FILES) \ + $(LIBGLSL_CXX_FILES) \ + $(BUILTIN_COMPILER_CXX_FILES) \ + $(GLSL_COMPILER_CXX_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ @@ -82,7 +82,7 @@ include $(BUILD_HOST_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(GLSL_COMPILER_CXX_SOURCES) + $(GLSL_COMPILER_CXX_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ diff --git a/src/glsl/Makefile b/src/glsl/Makefile index d9ecbc8e3e0..f6c722997e3 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -10,20 +10,20 @@ LIBNAME = glsl include Makefile.sources GLCPP_SOURCES = \ - $(LIBGLCPP_GENERATED_SOURCES) \ - $(LIBGLCPP_SOURCES) \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) \ ralloc.c \ glcpp/glcpp.c C_SOURCES = \ - $(LIBGLCPP_GENERATED_SOURCES) \ - $(LIBGLCPP_SOURCES) \ - $(LIBGLSL_SOURCES) + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) \ + $(LIBGLSL_FILES) # common sources for builtin_compiler and libglsl CXX_SOURCES = \ - $(BUILTIN_COMPILER_GENERATED_CXX_SOURCES) \ - $(LIBGLSL_CXX_SOURCES) + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(LIBGLSL_CXX_FILES) LIBS = \ $(TOP)/src/glsl/libglsl.a @@ -34,7 +34,7 @@ GLSL2_C_SOURCES = \ ../mesa/program/hash_table.c \ ../mesa/program/symbol_table.c GLSL2_CXX_SOURCES = \ - $(GLSL_COMPILER_CXX_SOURCES) + $(GLSL_COMPILER_CXX_FILES) GLSL2_OBJECTS = \ $(GLSL2_C_SOURCES:.c=.o) \ diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index 5e80af297c0..06728daf763 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -2,20 +2,20 @@ # libglcpp -LIBGLCPP_SOURCES := \ +LIBGLCPP_FILES := \ glcpp/pp.c -LIBGLCPP_GENERATED_SOURCES := \ +LIBGLCPP_GENERATED_FILES := \ glcpp/glcpp-lex.c \ glcpp/glcpp-parse.c # libglsl -LIBGLSL_SOURCES := \ +LIBGLSL_FILES := \ strtod.c \ ralloc.c -LIBGLSL_CXX_SOURCES := \ +LIBGLSL_CXX_FILES := \ ast_expr.cpp \ ast_function.cpp \ ast_to_hir.cpp \ @@ -82,7 +82,7 @@ LIBGLSL_CXX_SOURCES := \ # glsl_compiler -GLSL_COMPILER_CXX_SOURCES := \ +GLSL_COMPILER_CXX_FILES := \ standalone_scaffolding.cpp \ main.cpp @@ -92,14 +92,14 @@ GLSL_COMPILER_CXX_SOURCES := \ # For this to work, a dummy version of builtin_function.cpp, # builtin_stubs.cpp, is used. -BUILTIN_COMPILER_CXX_SOURCES := \ +BUILTIN_COMPILER_CXX_FILES := \ builtin_stubs.cpp -BUILTIN_COMPILER_GENERATED_CXX_SOURCES := \ +BUILTIN_COMPILER_GENERATED_CXX_FILES := \ glsl_lexer.cpp \ glsl_parser.cpp # libglsl generated sources -LIBGLSL_GENERATED_CXX_SOURCES := \ - $(BUILTIN_COMPILER_GENERATED_CXX_SOURCES) \ +LIBGLSL_GENERATED_CXX_FILES := \ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ builtin_function.cpp diff --git a/src/glsl/SConscript b/src/glsl/SConscript index b8154d6083c..f8e872368c2 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -42,7 +42,7 @@ glsl_sources = [ source_lists = env.ParseSourceList('Makefile.sources') # add non-generated sources -for l in ('LIBGLCPP_SOURCES', 'LIBGLSL_SOURCES', 'LIBGLSL_CXX_SOURCES'): +for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES', 'LIBGLSL_CXX_FILES'): glsl_sources += source_lists[l] if env['msvc']: @@ -57,7 +57,7 @@ else: env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE')) env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) - compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_SOURCES']) + compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) mesa_objs = env.StaticObject([ 'hash_table.c', @@ -69,7 +69,7 @@ else: builtin_compiler = env.Program( target = 'builtin_compiler', source = compiler_objs + glsl_sources + \ - source_lists['BUILTIN_COMPILER_CXX_SOURCES'], + source_lists['BUILTIN_COMPILER_CXX_FILES'], ) # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll |