LOCAL_MODULE := libmesa_program
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_STATIC_LIBRARIES := libmesa_glsl
-intermediates := $(call local-intermediates-dir)
+intermediates := $(call local-generated-sources-dir)
# TODO(chadv): In Makefile.sources, move these vars to a different list so we can
# remove this kludge.
program_parse.tab.h
LOCAL_SRC_FILES := \
- $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES)))
+ $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES))) \
+ $(subst program/,,$(PROGRAM_NIR_FILES))
LOCAL_GENERATED_SOURCES := \
$(addprefix $(intermediates)/program/,$(generated_sources_basenames))
$(local-l-to-c)
LOCAL_C_INCLUDES := \
- $(intermediates) \
- $(MESA_TOP)/src \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \
- $(MESA_TOP)/src/glsl
+ $(MESA_TOP)/src/glsl \
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(MESA_TOP)/src/gallium/include
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)