From: Dave Airlie <airlied@redhat.com>
Date: Tue, 17 Aug 2010 10:54:45 +0000 (+1000)
Subject: mesa: fix es1/2 build hopefully
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0aa41e1d9677bde9ed00751730acd23d636993eb;p=mesa.git

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 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)