diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 17:37:31 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 17:37:31 +0930 |
| commit | 26c1958c322be3ac4dfec9ba2c41c5202bd03709 (patch) | |
| tree | 0889c707db86e00f557618f3917b93e1a0472014 /hw/kdrive | |
| parent | 5fe57787faa2ea4f2f57b25455d200bf924206d6 (diff) | |
| parent | 29586101dc11d498b212510f8dedbfeca7f8c859 (diff) | |
Merge branch 'master' into mpx
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyrglxext.c | 8 | ||||
| -rw-r--r-- | hw/kdrive/fake/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/fbdev/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/sdl/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/vesa/Makefile.am | 4 |
7 files changed, 4 insertions, 26 deletions
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 526987672..140cccbc8 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -62,10 +62,6 @@ libxephyr_a_SOURCES = $(XEPHYR_SRCS) Xephyr_SOURCES = \ ephyrinit.c -if GLX -Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -endif - Xephyr_LDADD = \ libxephyr.a \ libxephyr-hostx.a \ diff --git a/hw/kdrive/ephyr/ephyrglxext.c b/hw/kdrive/ephyr/ephyrglxext.c index 2e08e392c..63c4ceda4 100644 --- a/hw/kdrive/ephyr/ephyrglxext.c +++ b/hw/kdrive/ephyr/ephyrglxext.c @@ -35,10 +35,10 @@ #define _HAVE_XALLOC_DECLS #include "ephyrlog.h" #include <GL/glxproto.h> -#include "GL/glx/glxserver.h" -#include "GL/glx/indirect_table.h" -#include "GL/glx/indirect_util.h" -#include "GL/glx/unpack.h" +#include "glx/glxserver.h" +#include "glx/indirect_table.h" +#include "glx/indirect_util.h" +#include "glx/unpack.h" #include "hostx.h" diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 0f8865699..09d179eb0 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -16,10 +16,6 @@ libfake_a_SOURCES = \ Xfake_SOURCES = \ fakeinit.c -if GLX -Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -endif - Xfake_LDADD = \ libfake.a \ @KDRIVE_LIBS@ \ diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index c77f146ee..420855b8d 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -14,10 +14,6 @@ bin_PROGRAMS = Xfbdev Xfbdev_SOURCES = \ fbinit.c -if GLX -Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -endif - Xfbdev_LDADD = \ libfbdev.a \ @KDRIVE_LIBS@ diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am index a70d147de..fe9309e46 100644 --- a/hw/kdrive/sdl/Makefile.am +++ b/hw/kdrive/sdl/Makefile.am @@ -7,10 +7,6 @@ bin_PROGRAMS = Xsdl Xsdl_SOURCES = sdl.c -if GLX -Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -endif - Xsdl_LDADD = \ @KDRIVE_LIBS@ \ @XSDL_LIBS@ diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index e2ee4adea..51dc633f7 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1412,5 +1412,3 @@ DPMSSupported (void) } #endif -void ddxInitGlobals(void) { /* THANK YOU XPRINT */ } - diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index ec35c1e2b..ac50d2bf5 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -19,10 +19,6 @@ libvesa_a_SOURCES = \ Xvesa_SOURCES = \ vesainit.c -if GLX -Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -endif - Xvesa_LDADD = \ libvesa.a \ @KDRIVE_LIBS@ |