Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changed references to XFree86 to Xext to match change in directory st…
…ructure.

  Reference Bugzilla #116.
  • Loading branch information
icculus committed Jan 31, 2006
1 parent 1624a42 commit b382950
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 43 deletions.
36 changes: 18 additions & 18 deletions configure.in
Expand Up @@ -670,8 +670,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_vm)
if test x$video_x11_vm = xyes; then
CFLAGS="$CFLAGS -DXFREE86_VM"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
AC_MSG_CHECKING(for XFree86 VidMode gamma support)
video_x11_vmgamma=no
AC_TRY_COMPILE([
Expand Down Expand Up @@ -710,8 +710,8 @@ CheckX11()
if test x$enable_video_x11_dgamouse = xyes; then
CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
fi
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
fi
fi
AC_ARG_ENABLE(video-x11-xv,
Expand All @@ -734,8 +734,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_xv)
if test x$video_x11_xv = xyes; then
CFLAGS="$CFLAGS -DXFREE86_XV"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
fi
fi
AC_ARG_ENABLE(video-x11-xinerama,
Expand All @@ -755,8 +755,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_xinerama)
if test x$video_x11_xinerama = xyes; then
CFLAGS="$CFLAGS -DHAVE_XINERAMA"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
fi
fi
AC_ARG_ENABLE(video-x11-xme,
Expand All @@ -768,8 +768,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_xme)
if test x$video_x11_xme = xyes; then
CFLAGS="$CFLAGS -DHAVE_XIGXME"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/XME"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/XME/libXME.la"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
fi
fi
fi
Expand Down Expand Up @@ -3057,7 +3057,7 @@ CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src -I\$(top_srcdir)/src/main/$ARCH"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/XFree86/extensions"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/Xext/extensions"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/events"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom"
Expand Down Expand Up @@ -3154,13 +3154,13 @@ src/video/windx5/Makefile
src/video/gapi/Makefile
src/video/x11/Makefile
src/video/xbios/Makefile
src/video/XFree86/Makefile
src/video/XFree86/extensions/Makefile
src/video/XFree86/Xinerama/Makefile
src/video/XFree86/Xv/Makefile
src/video/XFree86/Xxf86dga/Makefile
src/video/XFree86/Xxf86vm/Makefile
src/video/XFree86/XME/Makefile
src/video/Xext/Makefile
src/video/Xext/extensions/Makefile
src/video/Xext/Xinerama/Makefile
src/video/Xext/Xv/Makefile
src/video/Xext/Xxf86dga/Makefile
src/video/Xext/Xxf86vm/Makefile
src/video/Xext/XME/Makefile
src/events/Makefile
src/joystick/Makefile
src/joystick/amigaos/Makefile
Expand Down
4 changes: 2 additions & 2 deletions src/video/Xext/Xinerama/Makefile.am
@@ -1,5 +1,5 @@

## Makefile.am for the XFree86 Xinerama library

noinst_LTLIBRARIES = libXFree86_Xinerama.la
libXFree86_Xinerama_la_SOURCES = Xinerama.c
noinst_LTLIBRARIES = libXext_Xinerama.la
libXext_Xinerama_la_SOURCES = Xinerama.c
4 changes: 2 additions & 2 deletions src/video/Xext/Xv/Makefile.am
@@ -1,5 +1,5 @@

## Makefile.am for the XFree86 Xv library

noinst_LTLIBRARIES = libXFree86_Xv.la
libXFree86_Xv_la_SOURCES = Xv.c Xvlibint.h
noinst_LTLIBRARIES = libXext_Xv.la
libXext_Xv_la_SOURCES = Xv.c Xvlibint.h
4 changes: 2 additions & 2 deletions src/video/Xext/Xxf86dga/Makefile.am
@@ -1,5 +1,5 @@

## Makefile.am for the XFree86 Xxf86dga library

noinst_LTLIBRARIES = libXFree86_Xxf86dga.la
libXFree86_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c
noinst_LTLIBRARIES = libXext_Xxf86dga.la
libXext_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c
2 changes: 1 addition & 1 deletion src/video/Xext/Xxf86dga/XF86DGA.c
Expand Up @@ -341,7 +341,7 @@ Bool SDL_NAME(XF86DGAViewPortChanged)(
/* Helper functions */

#include <X11/Xmd.h>
#include <XFree86/extensions/xf86dga.h>
#include <Xext/extensions/xf86dga.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
Expand Down
4 changes: 2 additions & 2 deletions src/video/Xext/Xxf86vm/Makefile.am
@@ -1,5 +1,5 @@

## Makefile.am for the XFree86 Xxf86vm library

noinst_LTLIBRARIES = libXFree86_Xxf86vm.la
libXFree86_Xxf86vm_la_SOURCES = XF86VMode.c
noinst_LTLIBRARIES = libXext_Xxf86vm.la
libXext_Xxf86vm_la_SOURCES = XF86VMode.c
2 changes: 1 addition & 1 deletion src/video/Xext/extensions/Xvlib.h
Expand Up @@ -54,7 +54,7 @@ SOFTWARE.
*/

#include <X11/Xfuncproto.h>
#include <XFree86/extensions/Xv.h>
#include <Xext/extensions/Xv.h>
#include "SDL_name.h"

typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion src/video/Xext/extensions/xf86dga.h
Expand Up @@ -7,7 +7,7 @@
#define _XF86DGA_H_

#include <X11/Xfuncproto.h>
#include <XFree86/extensions/xf86dga1.h>
#include <Xext/extensions/xf86dga1.h>
#include "SDL_name.h"

#define X_XDGAQueryVersion 0
Expand Down
2 changes: 1 addition & 1 deletion src/video/Xext/extensions/xf86dgastr.h
Expand Up @@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc.
#ifndef _XF86DGASTR_H_
#define _XF86DGASTR_H_

#include <XFree86/extensions/xf86dga1str.h>
#include <Xext/extensions/xf86dga1str.h>

#define XF86DGANAME "XFree86-DGA"

Expand Down
2 changes: 1 addition & 1 deletion src/video/Xext/extensions/xf86vmstr.h
Expand Up @@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY
#ifndef _XF86VIDMODESTR_H_
#define _XF86VIDMODESTR_H_

#include <XFree86/extensions/xf86vmode.h>
#include <Xext/extensions/xf86vmode.h>

#define XF86VIDMODENAME "XFree86-VidModeExtension"

Expand Down
2 changes: 1 addition & 1 deletion src/video/dga/SDL_dgaevents.c
Expand Up @@ -29,7 +29,7 @@ static char rcsid =

#include <stdio.h>
#include <X11/Xlib.h>
#include <XFree86/extensions/xf86dga.h>
#include <Xext/extensions/xf86dga.h>

#include "SDL_sysvideo.h"
#include "SDL_events_c.h"
Expand Down
2 changes: 1 addition & 1 deletion src/video/dga/SDL_dgavideo.c
Expand Up @@ -31,7 +31,7 @@ static char rcsid =
#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
#include <XFree86/extensions/xf86dga.h>
#include <Xext/extensions/xf86dga.h>

#ifdef HAVE_ALLOCA_H
#include <alloca.h>
Expand Down
6 changes: 1 addition & 5 deletions src/video/x11/SDL_x11dyn.h
Expand Up @@ -29,11 +29,7 @@
#include <X11/Xproto.h>
#include <X11/Xlibint.h>

#if defined(__osf__)
#include <XFree86/extensions/extutil.h>
#else
#include <X11/extensions/extutil.h>
#endif
#include <Xext/extensions/extutil.h>

#ifndef NO_SHARED_MEMORY
#include <sys/ipc.h>
Expand Down
2 changes: 1 addition & 1 deletion src/video/x11/SDL_x11modes.c
Expand Up @@ -40,7 +40,7 @@ static char rcsid =
#include "SDL_x11image_c.h"

#ifdef HAVE_XINERAMA
#include <XFree86/extensions/Xinerama.h>
#include <Xext/extensions/Xinerama.h>
#endif

#define MAX(a, b) (a > b ? a : b)
Expand Down
6 changes: 3 additions & 3 deletions src/video/x11/SDL_x11video.h
Expand Up @@ -33,13 +33,13 @@ static char rcsid =
#include <X11/Xatom.h>

#ifdef XFREE86_DGAMOUSE
#include <XFree86/extensions/xf86dga.h>
#include <Xext/extensions/xf86dga.h>
#endif
#ifdef XFREE86_VM
#include <XFree86/extensions/xf86vmode.h>
#include <Xext/extensions/xf86vmode.h>
#endif
#ifdef HAVE_XIGXME
#include <XFree86/extensions/xme.h>
#include <Xext/extensions/xme.h>
#endif

#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion src/video/x11/SDL_x11yuv.c
Expand Up @@ -37,7 +37,7 @@ static char rcsid =
#include <sys/shm.h>
#include <X11/extensions/XShm.h>
#endif
#include <XFree86/extensions/Xvlib.h>
#include <Xext/extensions/Xvlib.h>

#include "SDL_error.h"
#include "SDL_video.h"
Expand Down

0 comments on commit b382950

Please sign in to comment.