summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-31 17:19:29 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-31 17:19:29 +0000
commitda7b85176fc061995e1b04fa22dc736b6c9353e6 (patch)
tree804afbbc51c865e85807fc43ea1fe5fd8b8730a2
parent1561ec3ca4f0d774f2664e9354d537061a0102d1 (diff)
Post-merge fixups:XORG-6_8_99_900
- Disable building the gamma driver - Fix numerous Imakefiles to get header paths and subdirs right - Symlink client-side GLX lib source from Mesa - Add new shader subdirs to the Mesa core build - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it, since they don't generate protocol, and it was breaking the build.
-rw-r--r--src/i810.h1
-rw-r--r--src/i810_dri.h1
-rw-r--r--src/i830.h1
-rw-r--r--src/i830_dri.h1
4 files changed, 0 insertions, 4 deletions
diff --git a/src/i810.h b/src/i810.h
index 01a21bf1..c23d72c9 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -55,7 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86drm.h"
#include "sarea.h"
#define _XF86DRI_SERVER_
-#include "xf86dri.h"
#include "dri.h"
#include "GL/glxint.h"
#include "i810_dri.h"
diff --git a/src/i810_dri.h b/src/i810_dri.h
index 14db3309..408a4ebb 100644
--- a/src/i810_dri.h
+++ b/src/i810_dri.h
@@ -3,7 +3,6 @@
#ifndef _I810_DRI_
#define _I810_DRI_
-#include "xf86dri.h"
#include "xf86drm.h"
#include "i810_common.h"
diff --git a/src/i830.h b/src/i830.h
index 46b0210a..eef28e79 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -63,7 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86drm.h"
#include "sarea.h"
#define _XF86DRI_SERVER_
-#include "xf86dri.h"
#include "dri.h"
#include "GL/glxint.h"
#include "i830_dri.h"
diff --git a/src/i830_dri.h b/src/i830_dri.h
index 339c03e2..e69a9cf7 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -3,7 +3,6 @@
#ifndef _I830_DRI_H
#define _I830_DRI_H
-#include "xf86dri.h"
#include "xf86drm.h"
#include "i830_common.h"