glsl: Fix handling of function calls inside nested loops.

[mesa.git] / src / glsl / Android.mk

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index d0b3ff3becfb04b96a17f98b1d6af9c09782fa1e..8a3942652996e198ce5fca6e3211d4ef41748a35 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -25,81 +25,9 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# from Makefile
-LIBGLCPP_SOURCES = \
-       glcpp/glcpp-lex.c \
-       glcpp/glcpp-parse.c \
-       glcpp/pp.c
-
-C_SOURCES = \
-       strtod.c \
-       ralloc.c \
-       $(LIBGLCPP_SOURCES)
-
-CXX_SOURCES = \
-       ast_expr.cpp \
-       ast_function.cpp \
-       ast_to_hir.cpp \
-       ast_type.cpp \
-       glsl_lexer.cpp \
-       glsl_parser.cpp \
-       glsl_parser_extras.cpp \
-       glsl_types.cpp \
-       glsl_symbol_table.cpp \
-       hir_field_selection.cpp \
-       ir_basic_block.cpp \
-       ir_clone.cpp \
-       ir_constant_expression.cpp \
-       ir.cpp \
-       ir_expression_flattening.cpp \
-       ir_function_can_inline.cpp \
-       ir_function_detect_recursion.cpp \
-       ir_function.cpp \
-       ir_hierarchical_visitor.cpp \
-       ir_hv_accept.cpp \
-       ir_import_prototypes.cpp \
-       ir_print_visitor.cpp \
-       ir_reader.cpp \
-       ir_rvalue_visitor.cpp \
-       ir_set_program_inouts.cpp \
-       ir_validate.cpp \
-       ir_variable.cpp \
-       ir_variable_refcount.cpp \
-       linker.cpp \
-       link_functions.cpp \
-       loop_analysis.cpp \
-       loop_controls.cpp \
-       loop_unroll.cpp \
-       lower_discard.cpp \
-       lower_if_to_cond_assign.cpp \
-       lower_instructions.cpp \
-       lower_jumps.cpp \
-       lower_mat_op_to_vec.cpp \
-       lower_noise.cpp \
-       lower_texture_projection.cpp \
-       lower_variable_index_to_cond_assign.cpp \
-       lower_vec_index_to_cond_assign.cpp \
-       lower_vec_index_to_swizzle.cpp \
-       lower_vector.cpp \
-       opt_algebraic.cpp \
-       opt_constant_folding.cpp \
-       opt_constant_propagation.cpp \
-       opt_constant_variable.cpp \
-       opt_copy_propagation.cpp \
-       opt_copy_propagation_elements.cpp \
-       opt_dead_code.cpp \
-       opt_dead_code_local.cpp \
-       opt_dead_functions.cpp \
-       opt_discard_simplification.cpp \
-       opt_function_inlining.cpp \
-       opt_if_simplification.cpp \
-       opt_noop_swizzle.cpp \
-       opt_redundant_jumps.cpp \
-       opt_structure_splitting.cpp \
-       opt_swizzle_swizzle.cpp \
-       opt_tree_grafting.cpp \
-       s_expression.cpp
+include $(LOCAL_PATH)/Makefile.sources
 
+GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------
@@ -107,11 +35,11 @@ CXX_SOURCES = \
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       $(C_SOURCES) \
-       $(CXX_SOURCES) \
-       builtin_function.cpp
+       $(LIBGLCPP_FILES) \
+       $(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
+       external/astl/include \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
@@ -121,33 +49,6 @@ include $(LOCAL_PATH)/Android.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
-# ---------------------------------------
-# Build mesa_builtin_compiler for host
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-       $(C_SOURCES) \
-       $(CXX_SOURCES) \
-       builtin_stubs.cpp \
-       main.cpp \
-       standalone_scaffolding.cpp
-
-LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/mesa
-
-LOCAL_STATIC_LIBRARIES := libmesa_glsl_utils
-
-LOCAL_MODULE := mesa_builtin_compiler
-
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_IS_HOST_MODULE := true
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_HOST_EXECUTABLE)
-
 # ---------------------------------------
 # Build glsl_compiler
 # ---------------------------------------
@@ -155,8 +56,7 @@ include $(BUILD_HOST_EXECUTABLE)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       main.cpp \
-       standalone_scaffolding.cpp
+       $(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \