Skip to content

L
libSDL
Commit dc8dc16f authored by Ryan C. Gordon's avatar Ryan C. Gordon
Browse files
Options

Changed references to XFree86 to Xext to match change in directory structure. 

  Reference Bugzilla #116.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401309
parent 1310074b
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 43 deletions
configure.in
View file @ dc8dc16f
...@@ -670,8 +670,8 @@ CheckX11() ...@@ -670,8 +670,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_vm) AC_MSG_RESULT($video_x11_vm)
if test x$video_x11_vm = xyes; then if test x$video_x11_vm = xyes; then
CFLAGS="$CFLAGS -DXFREE86_VM" CFLAGS="$CFLAGS -DXFREE86_VM"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86vm" VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86vm"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86vm/libXFree86_Xxf86vm.la" VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86vm/libXFree86_Xxf86vm.la"
AC_MSG_CHECKING(for XFree86 VidMode gamma support) AC_MSG_CHECKING(for XFree86 VidMode gamma support)
video_x11_vmgamma=no video_x11_vmgamma=no
AC_TRY_COMPILE([ AC_TRY_COMPILE([
...@@ -710,8 +710,8 @@ CheckX11() ...@@ -710,8 +710,8 @@ CheckX11()
if test x$enable_video_x11_dgamouse = xyes; then if test x$enable_video_x11_dgamouse = xyes; then
CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE" CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
fi fi
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xxf86dga" VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xxf86dga"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xxf86dga/libXFree86_Xxf86dga.la" VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xxf86dga/libXFree86_Xxf86dga.la"
fi fi
fi fi
AC_ARG_ENABLE(video-x11-xv, AC_ARG_ENABLE(video-x11-xv,
...@@ -734,8 +734,8 @@ CheckX11() ...@@ -734,8 +734,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_xv) AC_MSG_RESULT($video_x11_xv)
if test x$video_x11_xv = xyes; then if test x$video_x11_xv = xyes; then
CFLAGS="$CFLAGS -DXFREE86_XV" CFLAGS="$CFLAGS -DXFREE86_XV"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xv" VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xv"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xv/libXFree86_Xv.la" VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xv/libXFree86_Xv.la"
fi fi
fi fi
AC_ARG_ENABLE(video-x11-xinerama, AC_ARG_ENABLE(video-x11-xinerama,
...@@ -755,8 +755,8 @@ CheckX11() ...@@ -755,8 +755,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_xinerama) AC_MSG_RESULT($video_x11_xinerama)
if test x$video_x11_xinerama = xyes; then if test x$video_x11_xinerama = xyes; then
CFLAGS="$CFLAGS -DHAVE_XINERAMA" CFLAGS="$CFLAGS -DHAVE_XINERAMA"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/Xinerama" VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/Xinerama"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/Xinerama/libXFree86_Xinerama.la" VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/Xinerama/libXFree86_Xinerama.la"
fi fi
fi fi
AC_ARG_ENABLE(video-x11-xme, AC_ARG_ENABLE(video-x11-xme,
...@@ -768,8 +768,8 @@ CheckX11() ...@@ -768,8 +768,8 @@ CheckX11()
AC_MSG_RESULT($video_x11_xme) AC_MSG_RESULT($video_x11_xme)
if test x$video_x11_xme = xyes; then if test x$video_x11_xme = xyes; then
CFLAGS="$CFLAGS -DHAVE_XIGXME" CFLAGS="$CFLAGS -DHAVE_XIGXME"
VIDEO_SUBDIRS="$VIDEO_SUBDIRS XFree86/XME" VIDEO_SUBDIRS="$VIDEO_SUBDIRS Xext/XME"
VIDEO_DRIVERS="$VIDEO_DRIVERS XFree86/XME/libXME.la" VIDEO_DRIVERS="$VIDEO_DRIVERS Xext/XME/libXME.la"
fi fi
fi fi
fi fi
...@@ -3057,7 +3057,7 @@ CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL" ...@@ -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 -I\$(top_srcdir)/src/main/$ARCH"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/audio"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video" 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/events"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/joystick"
CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/cdrom"
...@@ -3154,13 +3154,13 @@ src/video/windx5/Makefile ...@@ -3154,13 +3154,13 @@ src/video/windx5/Makefile
src/video/gapi/Makefile src/video/gapi/Makefile
src/video/x11/Makefile src/video/x11/Makefile
src/video/xbios/Makefile src/video/xbios/Makefile
src/video/XFree86/Makefile src/video/Xext/Makefile
src/video/XFree86/extensions/Makefile src/video/Xext/extensions/Makefile
src/video/XFree86/Xinerama/Makefile src/video/Xext/Xinerama/Makefile
src/video/XFree86/Xv/Makefile src/video/Xext/Xv/Makefile
src/video/XFree86/Xxf86dga/Makefile src/video/Xext/Xxf86dga/Makefile
src/video/XFree86/Xxf86vm/Makefile src/video/Xext/Xxf86vm/Makefile
src/video/XFree86/XME/Makefile src/video/Xext/XME/Makefile
src/events/Makefile src/events/Makefile
src/joystick/Makefile src/joystick/Makefile
src/joystick/amigaos/Makefile src/joystick/amigaos/Makefile
......
src/video/Xext/Xinerama/Makefile.am
View file @ dc8dc16f
## Makefile.am for the XFree86 Xinerama library ## Makefile.am for the XFree86 Xinerama library
noinst_LTLIBRARIES = libXFree86_Xinerama.la noinst_LTLIBRARIES = libXext_Xinerama.la
libXFree86_Xinerama_la_SOURCES = Xinerama.c libXext_Xinerama_la_SOURCES = Xinerama.c
src/video/Xext/Xv/Makefile.am
View file @ dc8dc16f
## Makefile.am for the XFree86 Xv library ## Makefile.am for the XFree86 Xv library
noinst_LTLIBRARIES = libXFree86_Xv.la noinst_LTLIBRARIES = libXext_Xv.la
libXFree86_Xv_la_SOURCES = Xv.c Xvlibint.h libXext_Xv_la_SOURCES = Xv.c Xvlibint.h
src/video/Xext/Xxf86dga/Makefile.am
View file @ dc8dc16f
## Makefile.am for the XFree86 Xxf86dga library ## Makefile.am for the XFree86 Xxf86dga library
noinst_LTLIBRARIES = libXFree86_Xxf86dga.la noinst_LTLIBRARIES = libXext_Xxf86dga.la
libXFree86_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c libXext_Xxf86dga_la_SOURCES = XF86DGA2.c XF86DGA.c
src/video/Xext/Xxf86dga/XF86DGA.c
View file @ dc8dc16f
...@@ -341,7 +341,7 @@ Bool SDL_NAME(XF86DGAViewPortChanged)( ...@@ -341,7 +341,7 @@ Bool SDL_NAME(XF86DGAViewPortChanged)(
/* Helper functions */ /* Helper functions */
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <XFree86/extensions/xf86dga.h> #include <Xext/extensions/xf86dga.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
......
src/video/Xext/Xxf86vm/Makefile.am
View file @ dc8dc16f
## Makefile.am for the XFree86 Xxf86vm library ## Makefile.am for the XFree86 Xxf86vm library
noinst_LTLIBRARIES = libXFree86_Xxf86vm.la noinst_LTLIBRARIES = libXext_Xxf86vm.la
libXFree86_Xxf86vm_la_SOURCES = XF86VMode.c libXext_Xxf86vm_la_SOURCES = XF86VMode.c
src/video/Xext/extensions/Xvlib.h
View file @ dc8dc16f
...@@ -54,7 +54,7 @@ SOFTWARE. ...@@ -54,7 +54,7 @@ SOFTWARE.
*/ */
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include <XFree86/extensions/Xv.h> #include <Xext/extensions/Xv.h>
#include "SDL_name.h" #include "SDL_name.h"
typedef struct { typedef struct {
......
src/video/Xext/extensions/xf86dga.h
View file @ dc8dc16f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#define _XF86DGA_H_ #define _XF86DGA_H_
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include <XFree86/extensions/xf86dga1.h> #include <Xext/extensions/xf86dga1.h>
#include "SDL_name.h" #include "SDL_name.h"
#define X_XDGAQueryVersion 0 #define X_XDGAQueryVersion 0
......
src/video/Xext/extensions/xf86dgastr.h
View file @ dc8dc16f
...@@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc. ...@@ -9,7 +9,7 @@ Copyright (c) 1995 XFree86 Inc.
#ifndef _XF86DGASTR_H_ #ifndef _XF86DGASTR_H_
#define _XF86DGASTR_H_ #define _XF86DGASTR_H_
#include <XFree86/extensions/xf86dga1str.h> #include <Xext/extensions/xf86dga1str.h>
#define XF86DGANAME "XFree86-DGA" #define XF86DGANAME "XFree86-DGA"
......
src/video/Xext/extensions/xf86vmstr.h
View file @ dc8dc16f
...@@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY ...@@ -35,7 +35,7 @@ from Kaleb S. KEITHLEY
#ifndef _XF86VIDMODESTR_H_ #ifndef _XF86VIDMODESTR_H_
#define _XF86VIDMODESTR_H_ #define _XF86VIDMODESTR_H_
#include <XFree86/extensions/xf86vmode.h> #include <Xext/extensions/xf86vmode.h>
#define XF86VIDMODENAME "XFree86-VidModeExtension" #define XF86VIDMODENAME "XFree86-VidModeExtension"
......
src/video/dga/SDL_dgaevents.c
View file @ dc8dc16f
...@@ -29,7 +29,7 @@ static char rcsid = ...@@ -29,7 +29,7 @@ static char rcsid =
#include <stdio.h> #include <stdio.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <XFree86/extensions/xf86dga.h> #include <Xext/extensions/xf86dga.h>
#include "SDL_sysvideo.h" #include "SDL_sysvideo.h"
#include "SDL_events_c.h" #include "SDL_events_c.h"
......
src/video/dga/SDL_dgavideo.c
View file @ dc8dc16f
...@@ -31,7 +31,7 @@ static char rcsid = ...@@ -31,7 +31,7 @@ static char rcsid =
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <XFree86/extensions/xf86dga.h> #include <Xext/extensions/xf86dga.h>
#ifdef HAVE_ALLOCA_H #ifdef HAVE_ALLOCA_H
#include <alloca.h> #include <alloca.h>
......
src/video/x11/SDL_x11dyn.h
View file @ dc8dc16f
...@@ -29,11 +29,7 @@ ...@@ -29,11 +29,7 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#if defined(__osf__) #include <Xext/extensions/extutil.h>
#include <XFree86/extensions/extutil.h>
#else
#include <X11/extensions/extutil.h>
#endif
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
#include <sys/ipc.h> #include <sys/ipc.h>
......
src/video/x11/SDL_x11modes.c
View file @ dc8dc16f
...@@ -40,7 +40,7 @@ static char rcsid = ...@@ -40,7 +40,7 @@ static char rcsid =
#include "SDL_x11image_c.h" #include "SDL_x11image_c.h"
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
#include <XFree86/extensions/Xinerama.h> #include <Xext/extensions/Xinerama.h>
#endif #endif
#define MAX(a, b) (a > b ? a : b) #define MAX(a, b) (a > b ? a : b)
......
src/video/x11/SDL_x11video.h
View file @ dc8dc16f
...@@ -33,13 +33,13 @@ static char rcsid = ...@@ -33,13 +33,13 @@ static char rcsid =
#include <X11/Xatom.h> #include <X11/Xatom.h>
#ifdef XFREE86_DGAMOUSE #ifdef XFREE86_DGAMOUSE
#include <XFree86/extensions/xf86dga.h> #include <Xext/extensions/xf86dga.h>
#endif #endif
#ifdef XFREE86_VM #ifdef XFREE86_VM
#include <XFree86/extensions/xf86vmode.h> #include <Xext/extensions/xf86vmode.h>
#endif #endif
#ifdef HAVE_XIGXME #ifdef HAVE_XIGXME
#include <XFree86/extensions/xme.h> #include <Xext/extensions/xme.h>
#endif #endif
#include <string.h> #include <string.h>
......
src/video/x11/SDL_x11yuv.c
View file @ dc8dc16f
...@@ -37,7 +37,7 @@ static char rcsid = ...@@ -37,7 +37,7 @@ static char rcsid =
#include <sys/shm.h> #include <sys/shm.h>
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#endif #endif
#include <XFree86/extensions/Xvlib.h> #include <Xext/extensions/Xvlib.h>
#include "SDL_error.h" #include "SDL_error.h"
#include "SDL_video.h" #include "SDL_video.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment