summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2013-04-19 20:41:08 +0200
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-05-01 21:34:48 +0200
commit6b8f55c4da11f892bcbc878fc92c7119aaabf674 (patch)
treec3100ca99703c363c8070f07a34a641cce83bfc0
parentafa33a001a39c44238ba8fd76f8eeabad041459e (diff)
intel: use automake conditionals for defining FEATURE_{ES1,ES2}
Removes the need of API_DEFINES. Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.am11
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am11
2 files changed, 20 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 72e0659530a..95017191949 100644
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -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
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 77670efdee8..32b041a8caa 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -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)