mesa: fix es1/2 build hopefully

needed to add cpp rules and includes properly for es1/es2

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index f97720093c8f2b14cbd32929f87793e33d0462dc..ef31fd24f08854c0a4d4ad1e1e8101b6ce698302 100644 (file)
--- 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)