Mercurial > sdl-ios-xcode

changeset 1306:0c105755b110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed references to XFree86 to Xext to match change in directory structure. Reference Bugzilla #116.
author Ryan C. Gordon <icculus@icculus.org>
date Tue, 31 Jan 2006 18:39:32 +0000
parents babc963b6f8d
children 1c775d9abd2c
files configure.in src/video/Xext/Xinerama/Makefile.am src/video/Xext/Xv/Makefile.am src/video/Xext/Xxf86dga/Makefile.am src/video/Xext/Xxf86dga/XF86DGA.c src/video/Xext/Xxf86vm/Makefile.am src/video/Xext/extensions/Xvlib.h src/video/Xext/extensions/xf86dga.h src/video/Xext/extensions/xf86dgastr.h src/video/Xext/extensions/xf86vmstr.h src/video/dga/SDL_dgaevents.c src/video/dga/SDL_dgavideo.c src/video/x11/SDL_x11dyn.h src/video/x11/SDL_x11modes.c src/video/x11/SDL_x11video.h src/video/x11/SDL_x11yuv.c
diffstat 16 files changed, 39 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Tue Jan 31 18:08:33 2006 +0000
+++ b/configure.in	Tue Jan 31 18:39:32 2006 +0000
@@ -670,8 +670,8 @@
                 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([
@@ -710,8 +710,8 @@
                     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,
@@ -734,8 +734,8 @@
                 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,
@@ -755,8 +755,8 @@
                 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,
@@ -768,8 +768,8 @@
                 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
@@ -3057,7 +3057,7 @@
 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"
@@ -3154,13 +3154,13 @@
 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
--- a/src/video/Xext/Xinerama/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/Xinerama/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
@@ -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
--- a/src/video/Xext/Xv/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/Xv/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
@@ -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
--- a/src/video/Xext/Xxf86dga/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/Xxf86dga/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
@@ -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
--- a/src/video/Xext/Xxf86dga/XF86DGA.c	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Tue Jan 31 18:39:32 2006 +0000
@@ -341,7 +341,7 @@
 /* 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>
--- a/src/video/Xext/Xxf86vm/Makefile.am	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/Xxf86vm/Makefile.am	Tue Jan 31 18:39:32 2006 +0000
@@ -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
--- a/src/video/Xext/extensions/Xvlib.h	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/extensions/Xvlib.h	Tue Jan 31 18:39:32 2006 +0000
@@ -54,7 +54,7 @@
 */
 
 #include <X11/Xfuncproto.h>
-#include <XFree86/extensions/Xv.h>
+#include <Xext/extensions/Xv.h>
 #include "SDL_name.h"
 
 typedef struct {
--- a/src/video/Xext/extensions/xf86dga.h	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/extensions/xf86dga.h	Tue Jan 31 18:39:32 2006 +0000
@@ -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
--- a/src/video/Xext/extensions/xf86dgastr.h	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/extensions/xf86dgastr.h	Tue Jan 31 18:39:32 2006 +0000
@@ -9,7 +9,7 @@
 #ifndef _XF86DGASTR_H_
 #define _XF86DGASTR_H_
 
-#include <XFree86/extensions/xf86dga1str.h>
+#include <Xext/extensions/xf86dga1str.h>
 
 #define XF86DGANAME "XFree86-DGA"
 
--- a/src/video/Xext/extensions/xf86vmstr.h	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/Xext/extensions/xf86vmstr.h	Tue Jan 31 18:39:32 2006 +0000
@@ -35,7 +35,7 @@
 #ifndef _XF86VIDMODESTR_H_
 #define _XF86VIDMODESTR_H_
 
-#include <XFree86/extensions/xf86vmode.h>
+#include <Xext/extensions/xf86vmode.h>
 
 #define XF86VIDMODENAME "XFree86-VidModeExtension"
 
--- a/src/video/dga/SDL_dgaevents.c	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/dga/SDL_dgaevents.c	Tue Jan 31 18:39:32 2006 +0000
@@ -29,7 +29,7 @@
 
 #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"
--- a/src/video/dga/SDL_dgavideo.c	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/dga/SDL_dgavideo.c	Tue Jan 31 18:39:32 2006 +0000
@@ -31,7 +31,7 @@
 #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>
--- a/src/video/x11/SDL_x11dyn.h	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/x11/SDL_x11dyn.h	Tue Jan 31 18:39:32 2006 +0000
@@ -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>
--- a/src/video/x11/SDL_x11modes.c	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/x11/SDL_x11modes.c	Tue Jan 31 18:39:32 2006 +0000
@@ -40,7 +40,7 @@
 #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)
--- a/src/video/x11/SDL_x11video.h	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/x11/SDL_x11video.h	Tue Jan 31 18:39:32 2006 +0000
@@ -33,13 +33,13 @@
 #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>
--- a/src/video/x11/SDL_x11yuv.c	Tue Jan 31 18:08:33 2006 +0000
+++ b/src/video/x11/SDL_x11yuv.c	Tue Jan 31 18:39:32 2006 +0000
@@ -37,7 +37,7 @@
 #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"