summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index f97720093c8..ef31fd24f08 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -43,6 +43,8 @@ MESA_INCLUDES := $(INCLUDE_DIRS)
ES1_INCLUDES := -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS)
ES2_INCLUDES := -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS)
MESA_INCLUDES := -I$(TOP)/src/glsl $(MESA_INCLUDES)
+ES1_INCLUDES := -I$(TOP)/src/glsl $(ES1_INCLUDES)
+ES2_INCLUDES := -I$(TOP)/src/glsl $(ES2_INCLUDES)
# For symbol_table.h in glsl compiler headers.
MESA_INCLUDES := -I$(TOP)/src/mesa/shader $(MESA_INCLUDES)
@@ -68,12 +70,18 @@ $(MESA_OBJ_DIR)/%.o: %.S
$(ES1_OBJ_DIR)/%.o: %.c
$(call mesa-cc-c,ES1)
+$(ES1_OBJ_DIR)/%.o: %.cpp
+ $(call mesa-cxx-c,ES1)
+
$(ES1_OBJ_DIR)/%.o: %.S
$(call mesa-cc-c,ES1)
$(ES2_OBJ_DIR)/%.o: %.c
$(call mesa-cc-c,ES2)
+$(ES2_OBJ_DIR)/%.o: %.cpp
+ $(call mesa-cxx-c,ES2)
+
$(ES2_OBJ_DIR)/%.o: %.S
$(call mesa-cc-c,ES2)