summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorAdam Jackson <[email protected]>2006-08-10 20:19:57 +0000
committerAdam Jackson <[email protected]>2006-08-10 20:19:57 +0000
commitbe85fde82b148c4fc3639fcf3cfedb5de9381fc8 (patch)
tree7740c9ad8cca4717930b1466add6735ad9c341b4 /src/glx
parentb7a661cf8c9adc5fdba31f11545e8caebac7995a (diff)
linux-indirect target fixes.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/x11/Makefile2
-rw-r--r--src/glx/x11/XF86dri.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 3ecb744179f..c509d4e0851 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -47,7 +47,7 @@ INCLUDES = -I. \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
-I$(TOP)/src/mesa/drivers/dri/common \
- `pkg-config --cflags libdrm` \
+ $(LIBDRM_CFLAGS) \
$(X11_INCLUDES)
diff --git a/src/glx/x11/XF86dri.c b/src/glx/x11/XF86dri.c
index 3f989fa986e..0ce588276be 100644
--- a/src/glx/x11/XF86dri.c
+++ b/src/glx/x11/XF86dri.c
@@ -37,6 +37,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* THIS IS NOT AN X CONSORTIUM STANDARD */
+#ifdef GLX_DIRECT_RENDERING
+
#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
@@ -617,3 +619,5 @@ PUBLIC Bool XF86DRICloseFullScreen(dpy, screen, drawable)
(void) drawable;
return True;
}
+
+#endif /* GLX_DIRECT_RENDERING */