intel: use automake conditionals for defining FEATURE_{ES1,ES2}

Removes the need of API_DEFINES. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-04-19 20:41:08 +02:00
parent afa33a001a
commit 6b8f55c4da
2 changed files with 20 additions and 2 deletions
@@ -34,10 +34,19 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
 	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
-	$(API_DEFINES) \
 	$(VISIBILITY_CFLAGS) \
 	$(INTEL_CFLAGS)

+if HAVE_OPENGL_ES1
+AM_CFLAGS += \
+	-DFEATURE_ES1=1
+endif
+
+if HAVE_OPENGL_ES2
+AM_CFLAGS += \
+	-DFEATURE_ES2=1
+endif
+
 dridir = $(DRI_DRIVER_INSTALL_DIR)

 if HAVE_I915_DRI
@@ -36,10 +36,19 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/gtest/include \
 	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
-	$(API_DEFINES) \
 	$(VISIBILITY_CFLAGS) \
 	$(INTEL_CFLAGS)

+if HAVE_OPENGL_ES1
+AM_CFLAGS += \
+	-DFEATURE_ES1=1
+endif
+
+if HAVE_OPENGL_ES2
+AM_CFLAGS += \
+	-DFEATURE_ES2=1
+endif
+
 AM_CXXFLAGS = $(AM_CFLAGS)

 dridir = $(DRI_DRIVER_INSTALL_DIR)