aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-04 10:58:53 +0200
committermarha <marha@users.sourceforge.net>2012-10-04 10:58:53 +0200
commitbd13c464f728719fceb8a4918b52727ec125ea6e (patch)
tree05a48375076036097a9e28356738c05a16cc5ed0 /mesalib/src/mesa/drivers
parentbab6395ded69210cbc550c0fb3765160e4405283 (diff)
parent0130346adbce7e6b2422429887fc46c76806d845 (diff)
downloadvcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.gz
vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.bz2
vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.zip
Merge remote-tracking branch 'origin/released'
* origin/released: randrproto mesa pixman git update 4 oct 2012
Diffstat (limited to 'mesalib/src/mesa/drivers')
-rw-r--r--mesalib/src/mesa/drivers/dri/common/Makefile.am3
-rw-r--r--mesalib/src/mesa/drivers/dri/swrast/Makefile.am3
2 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am
index 6e9d738fa..a662919b5 100644
--- a/mesalib/src/mesa/drivers/dri/common/Makefile.am
+++ b/mesalib/src/mesa/drivers/dri/common/Makefile.am
@@ -26,7 +26,8 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES) \
$(API_DEFINES) \
- $(LIBDRM_CFLAGS)
+ $(LIBDRM_CFLAGS) \
+ $(VISIBILITY_CFLAGS)
noinst_LTLIBRARIES = \
libdricommon.la \
diff --git a/mesalib/src/mesa/drivers/dri/swrast/Makefile.am b/mesalib/src/mesa/drivers/dri/swrast/Makefile.am
index 16a34413b..244aa8b27 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/mesalib/src/mesa/drivers/dri/swrast/Makefile.am
@@ -34,7 +34,8 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \
- $(API_DEFINES)
+ $(API_DEFINES) \
+ $(VISIBILITY_CFLAGS)
dridir = $(DRI_DRIVER_INSTALL_DIR)