Mesa (master): mesa: fix es1/2 build hopefully

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 0aa41e1d9677bde9ed00751730acd23d636993eb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aa41e1d9677bde9ed00751730acd23d636993eb

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Aug 17 20:54:45 2010 +1000

mesa: fix es1/2 build hopefully

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

---

 src/mesa/Makefile |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index f977200..ef31fd2 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)