📄 sdl-1.2.9-xynth.diff
字号:
+ echo "$as_me: failed program was:" >&5+sed 's/^/| /' conftest.$ac_ext >&5++fi+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext+ echo "$as_me:$LINENO: result: $video_xynth" >&5+echo "${ECHO_T}$video_xynth" >&6+ if test x$video_xynth = xyes; then+ CFLAGS="$CFLAGS -DENABLE_XYNTH"+ SYSTEM_LIBS="$SYSTEM_LIBS -lxynth"++ VIDEO_SUBDIRS="$VIDEO_SUBDIRS xynth"+ VIDEO_DRIVERS="$VIDEO_DRIVERS xynth/libvideo_xynth.la"+ fi+ fi+}+ CheckVGL() { # Check whether --enable-video-vgl or --disable-video-vgl was given.@@ -29805,6 +29880,7 @@ CheckPS2GS CheckGGI CheckSVGA+ CheckXynth CheckAAlib CheckQtopia CheckPicoGUI@@ -29902,6 +29978,7 @@ CheckX11 CheckDGA CheckSVGA+ CheckXynth CheckAAlib CheckOpenGL CheckPTHREAD@@ -29962,6 +30039,7 @@ CheckX11 CheckDGA CheckSVGA+ CheckXynth CheckAAlib CheckOpenGL CheckPTHREAD@@ -31773,7 +31851,7 @@ esac # Finally create all the generated files- ac_config_files="$ac_config_files Makefile docs/Makefile docs/html/Makefile docs/man3/Makefile include/Makefile src/Makefile src/main/Makefile src/main/macosx/Makefile src/main/macosx/Info.plist src/audio/Makefile src/audio/alsa/Makefile src/audio/arts/Makefile src/audio/baudio/Makefile src/audio/dc/Makefile src/audio/disk/Makefile src/audio/dma/Makefile src/audio/dmedia/Makefile src/audio/dsp/Makefile src/audio/esd/Makefile src/audio/macosx/Makefile src/audio/macrom/Makefile src/audio/mint/Makefile src/audio/mme/Makefile src/audio/nas/Makefile src/audio/nto/Makefile src/audio/openbsd/Makefile src/audio/paudio/Makefile src/audio/sun/Makefile src/audio/ums/Makefile src/audio/windib/Makefile src/audio/windx5/Makefile src/video/Makefile src/video/aalib/Makefile src/video/ataricommon/Makefile src/video/bwindow/Makefile src/video/cybergfx/Makefile src/video/dc/Makefile src/video/dga/Makefile src/video/directfb/Makefile src/video/dummy/Makefile src/video/epoc/Makefile src/video/fbcon/Makefile src/video/gem/Makefile src/video/ggi/Makefile src/video/maccommon/Makefile src/video/macdsp/Makefile src/video/macrom/Makefile src/video/nanox/Makefile src/video/photon/Makefile src/video/picogui/Makefile src/video/ps2gs/Makefile src/video/qtopia/Makefile src/video/quartz/Makefile src/video/riscos/Makefile src/video/svga/Makefile src/video/vgl/Makefile src/video/wincommon/Makefile src/video/windib/Makefile src/video/windx5/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/events/Makefile src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile src/joystick/bsd/Makefile src/joystick/darwin/Makefile src/joystick/dc/Makefile src/joystick/dummy/Makefile src/joystick/linux/Makefile src/joystick/macos/Makefile src/joystick/mint/Makefile src/joystick/riscos/Makefile src/joystick/win32/Makefile src/cdrom/Makefile src/cdrom/aix/Makefile src/cdrom/beos/Makefile src/cdrom/dc/Makefile src/cdrom/dummy/Makefile src/cdrom/bsdi/Makefile src/cdrom/freebsd/Makefile src/cdrom/linux/Makefile src/cdrom/macos/Makefile src/cdrom/macosx/Makefile src/cdrom/mint/Makefile src/cdrom/openbsd/Makefile src/cdrom/osf/Makefile src/cdrom/qnx/Makefile src/cdrom/win32/Makefile src/thread/Makefile src/timer/Makefile src/endian/Makefile src/file/Makefile src/cpuinfo/Makefile src/hermes/Makefile sdl-config SDL.spec SDL.qpg"+ ac_config_files="$ac_config_files Makefile docs/Makefile docs/html/Makefile docs/man3/Makefile include/Makefile src/Makefile src/main/Makefile src/main/macosx/Makefile src/main/macosx/Info.plist src/audio/Makefile src/audio/alsa/Makefile src/audio/arts/Makefile src/audio/baudio/Makefile src/audio/dc/Makefile src/audio/disk/Makefile src/audio/dma/Makefile src/audio/dmedia/Makefile src/audio/dsp/Makefile src/audio/esd/Makefile src/audio/macosx/Makefile src/audio/macrom/Makefile src/audio/mint/Makefile src/audio/mme/Makefile src/audio/nas/Makefile src/audio/nto/Makefile src/audio/openbsd/Makefile src/audio/paudio/Makefile src/audio/sun/Makefile src/audio/ums/Makefile src/audio/windib/Makefile src/audio/windx5/Makefile src/video/Makefile src/video/aalib/Makefile src/video/ataricommon/Makefile src/video/bwindow/Makefile src/video/cybergfx/Makefile src/video/dc/Makefile src/video/dga/Makefile src/video/directfb/Makefile src/video/dummy/Makefile src/video/epoc/Makefile src/video/fbcon/Makefile src/video/gem/Makefile src/video/ggi/Makefile src/video/maccommon/Makefile src/video/macdsp/Makefile src/video/macrom/Makefile src/video/nanox/Makefile src/video/photon/Makefile src/video/picogui/Makefile src/video/ps2gs/Makefile src/video/qtopia/Makefile src/video/quartz/Makefile src/video/riscos/Makefile src/video/svga/Makefile src/video/xynth/Makefile src/video/vgl/Makefile src/video/wincommon/Makefile src/video/windib/Makefile src/video/windx5/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/events/Makefile src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile src/joystick/bsd/Makefile src/joystick/darwin/Makefile src/joystick/dc/Makefile src/joystick/dummy/Makefile src/joystick/linux/Makefile src/joystick/macos/Makefile src/joystick/mint/Makefile src/joystick/riscos/Makefile src/joystick/win32/Makefile src/cdrom/Makefile src/cdrom/aix/Makefile src/cdrom/beos/Makefile src/cdrom/dc/Makefile src/cdrom/dummy/Makefile src/cdrom/bsdi/Makefile src/cdrom/freebsd/Makefile src/cdrom/linux/Makefile src/cdrom/macos/Makefile src/cdrom/macosx/Makefile src/cdrom/mint/Makefile src/cdrom/openbsd/Makefile src/cdrom/osf/Makefile src/cdrom/qnx/Makefile src/cdrom/win32/Makefile src/thread/Makefile src/timer/Makefile src/endian/Makefile src/file/Makefile src/cpuinfo/Makefile src/hermes/Makefile sdl-config SDL.spec SDL.qpg" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure@@ -32573,6 +32651,7 @@ "src/video/quartz/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/quartz/Makefile" ;; "src/video/riscos/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/riscos/Makefile" ;; "src/video/svga/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/svga/Makefile" ;;+ "src/video/xynth/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/xynth/Makefile" ;; "src/video/vgl/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/vgl/Makefile" ;; "src/video/wincommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/wincommon/Makefile" ;; "src/video/windib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/video/windib/Makefile" ;;diff -U 3 -H -d -r -N SDL-1.2.9/configure.in SDL-1.2.9-xynth/configure.in--- SDL-1.2.9/configure.in 2005-08-28 09:31:18.000000000 +0300+++ SDL-1.2.9-xynth/configure.in 2005-12-02 14:14:03.000000000 +0200@@ -947,6 +947,32 @@ fi } +dnl Find the Xynth includes and libraries+CheckXynth()+{+ AC_ARG_ENABLE(video-xynth,+[ --enable-video-xynth use The Xynth Windowing System [default=yes]],+ , enable_video_xynth=yes)+ if test x$enable_video = xyes -a x$enable_video_xynth = xyes; then+ AC_MSG_CHECKING(for Xynth support)+ video_xynth=yes+ AC_TRY_COMPILE([+ #include <xynth.h>+ ],[+ ],[+ video_xynth=yes+ ])+ AC_MSG_RESULT($video_xynth)+ if test x$video_xynth = xyes; then+ CFLAGS="$CFLAGS -DENABLE_XYNTH"+ SYSTEM_LIBS="$SYSTEM_LIBS -lxynth"++ VIDEO_SUBDIRS="$VIDEO_SUBDIRS xynth"+ VIDEO_DRIVERS="$VIDEO_DRIVERS xynth/libvideo_xynth.la"+ fi+ fi+}+ dnl Find the VGL includes and libraries CheckVGL() {@@ -1898,6 +1924,7 @@ CheckPS2GS CheckGGI CheckSVGA+ CheckXynth CheckAAlib CheckQtopia CheckPicoGUI@@ -1981,6 +2008,7 @@ CheckX11 CheckDGA CheckSVGA+ CheckXynth CheckAAlib CheckOpenGL CheckPTHREAD@@ -2027,6 +2055,7 @@ CheckX11 CheckDGA CheckSVGA+ CheckXynth CheckAAlib CheckOpenGL CheckPTHREAD@@ -2922,6 +2951,7 @@ src/video/quartz/Makefile src/video/riscos/Makefile src/video/svga/Makefile+src/video/xynth/Makefile src/video/vgl/Makefile src/video/wincommon/Makefile src/video/windib/Makefilediff -U 3 -H -d -r -N SDL-1.2.9/src/video/Makefile.am SDL-1.2.9-xynth/src/video/Makefile.am--- SDL-1.2.9/src/video/Makefile.am 2003-08-22 08:51:19.000000000 +0300+++ SDL-1.2.9-xynth/src/video/Makefile.am 2005-12-02 14:14:03.000000000 +0200@@ -5,7 +5,7 @@ # Define which subdirectories need to be built SUBDIRS = @VIDEO_SUBDIRS@-DIST_SUBDIRS = dummy x11 dga nanox fbcon directfb vgl svga ggi aalib \+DIST_SUBDIRS = dummy x11 dga nanox fbcon directfb vgl svga xynth ggi aalib \ wincommon windib windx5 \ maccommon macdsp macrom riscos quartz \ bwindow ps2gs photon cybergfx epoc picogui \diff -U 3 -H -d -r -N SDL-1.2.9/src/video/Makefile.in SDL-1.2.9-xynth/src/video/Makefile.in--- SDL-1.2.9/src/video/Makefile.in 2005-08-28 09:31:56.000000000 +0300+++ SDL-1.2.9-xynth/src/video/Makefile.in 2005-12-02 14:12:34.000000000 +0200@@ -1,4 +1,4 @@-# Makefile.in generated by automake 1.9.6 from Makefile.am.+# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,@@ -14,6 +14,8 @@ @SET_MAKE@ +SOURCES = $(libvideo_la_SOURCES)+ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@@@ -284,7 +286,7 @@ # Define which subdirectories need to be built SUBDIRS = @VIDEO_SUBDIRS@-DIST_SUBDIRS = dummy x11 dga nanox fbcon directfb vgl svga ggi aalib \+DIST_SUBDIRS = dummy x11 dga nanox fbcon directfb vgl svga xynth ggi aalib \ wincommon windib windx5 \ maccommon macdsp macrom riscos quartz \ bwindow ps2gs photon cybergfx epoc picogui \diff -U 3 -H -d -r -N SDL-1.2.9/src/video/SDL_sysvideo.h SDL-1.2.9-xynth/src/video/SDL_sysvideo.h--- SDL-1.2.9/src/video/SDL_sysvideo.h 2005-04-17 13:40:41.000000000 +0300+++ SDL-1.2.9-xynth/src/video/SDL_sysvideo.h 2005-12-02 14:14:03.000000000 +0200@@ -359,6 +359,9 @@ #ifdef ENABLE_SVGALIB extern VideoBootStrap SVGALIB_bootstrap; #endif+#ifdef ENABLE_XYNTH+extern VideoBootStrap XYNTH_bootstrap;+#endif #ifdef ENABLE_AALIB extern VideoBootStrap AALIB_bootstrap; #endifdiff -U 3 -H -d -r -N SDL-1.2.9/src/video/SDL_video.c SDL-1.2.9-xynth/src/video/SDL_video.c--- SDL-1.2.9/src/video/SDL_video.c 2005-06-12 19:12:55.000000000 +0300+++ SDL-1.2.9-xynth/src/video/SDL_video.c 2005-12-02 14:14:03.000000000 +0200@@ -75,6 +75,9 @@ #ifdef ENABLE_SVGALIB &SVGALIB_bootstrap, #endif+#ifdef ENABLE_XYNTH+ &XYNTH_bootstrap,+#endif #ifdef ENABLE_AALIB &AALIB_bootstrap, #endifdiff -U 3 -H -d -r -N SDL-1.2.9/src/video/xynth/Makefile.am SDL-1.2.9-xynth/src/video/xynth/Makefile.am--- SDL-1.2.9/src/video/xynth/Makefile.am 1970-01-01 02:00:00.000000000 +0200+++ SDL-1.2.9-xynth/src/video/xynth/Makefile.am 2005-02-21 19:03:20.000000000 +0200@@ -0,0 +1,17 @@++## Makefile.am for SDL using the xynth video driver++noinst_LTLIBRARIES = libvideo_xynth.la+libvideo_xynth_la_SOURCES = $(XYNTH_SRCS)++# The SDL xynth video driver sources+XYNTH_SRCS = \+ SDL_xynthcursor.c \+ SDL_xynthevent.c \+ SDL_xynthgamma.c \+ SDL_xynthgl.c \+ SDL_xynthhw.c \+ SDL_xynthvideo.c \+ SDL_xynthwm.c \+ SDL_xynth.h+diff -U 3 -H -d -r -N SDL-1.2.9/src/video/xynth/Makefile.in SDL-1.2.9-xynth/src/video/xynth/Makefile.in--- SDL-1.2.9/src/video/xynth/Makefile.in 1970-01-01 02:00:00.000000000 +0200+++ SDL-1.2.9-xynth/src/video/xynth/Makefile.in 2004-11-19 17:25:21.000000000 +0200@@ -0,0 +1,558 @@+# Makefile.in generated by automake 1.8.5 from Makefile.am.+# @configure_input@++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,+# 2003, 2004 Free Software Foundation, Inc.+# This Makefile.in is free software; the Free Software Foundation+# gives unlimited permission to copy and/or distribute it,+# with or without modifications, as long as this notice is preserved.++# This program is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A+# PARTICULAR PURPOSE.++@SET_MAKE@++SOURCES = $(libvideo_xynth_la_SOURCES)++srcdir = @srcdir@+top_srcdir = @top_srcdir@+VPATH = @srcdir@+pkgdatadir = $(datadir)/@PACKAGE@+pkglibdir = $(libdir)/@PACKAGE@+pkgincludedir = $(includedir)/@PACKAGE@+top_builddir = ../../..+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd+INSTALL = @INSTALL@+install_sh_DATA = $(install_sh) -c -m 644+install_sh_PROGRAM = $(install_sh) -c+install_sh_SCRIPT = $(install_sh) -c+INSTALL_HEADER = $(INSTALL_DATA)+transform = $(program_transform_name)+NORMAL_INSTALL = :+PRE_INSTALL = :+POST_INSTALL = :+NORMAL_UNINSTALL = :+PRE_UNINSTALL = :+POST_UNINSTALL = :+build_triplet = @build@+host_triplet = @host@+target_triplet = @target@+subdir = src/video/xynth+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \+ $(top_srcdir)/configure.in+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \+ $(ACLOCAL_M4)+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs+CONFIG_CLEAN_FILES =+LTLIBRARIES = $(noinst_LTLIBRARIES)+libvideo_xynth_la_LIBADD =+am__objects_1 = SDL_xynthcursor.lo SDL_xynthevent.lo SDL_xynthgamma.lo \+ SDL_xynthgl.lo SDL_xynthhw.lo SDL_xynthvideo.lo SDL_xynthwm.lo+am_libvideo_xynth_la_OBJECTS = $(am__objects_1)+libvideo_xynth_la_OBJECTS = $(am_libvideo_xynth_la_OBJECTS)+DEFAULT_INCLUDES = -I. -I$(srcdir)+depcomp = $(SHELL) $(top_srcdir)/depcomp+am__depfiles_maybe = depfiles+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/SDL_xynthcursor.Plo \+@AMDEP_TRUE@ ./$(DEPDIR)/SDL_xynthevent.Plo \+@AMDEP_TRUE@ ./$(DEPDIR)/SDL_xynthgamma.Plo \+@AMDEP_TRUE@ ./$(DEPDIR)/SDL_xynthgl.Plo \+@AMDEP_TRUE@ ./$(DEPDIR)/SDL_xynthhw.Plo \+@AMDEP_TRUE@ ./$(DEPDIR)/SDL_xynthvideo.Plo \+@AMDEP_TRUE@ ./$(DEPDIR)/SDL_xynthwm.Plo+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \+ $(AM_CFLAGS) $(CFLAGS)+CCLD = $(CC)+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \+ $(AM_LDFLAGS) $(LDFLAGS) -o $@+SOURCES = $(libvideo_xynth_la_SOURCES)+DIST_SOURCES = $(libvideo_xynth_la_SOURCES)+ETAGS = etags+CTAGS = ctags+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)+ACLOCAL = @ACLOCAL@+ALLOCA = @ALLOCA@+AMDEP_FALSE = @AMDEP_FALSE@+AMDEP_TRUE = @AMDEP_TRUE@+AMTAR = @AMTAR@+AR = @AR@+ARCH = @ARCH@+ARTSCCONFIG = @ARTSCCONFIG@+AS = @AS@+ASFLAGS = @ASFLAGS@+AUDIO_DRIVERS = @AUDIO_DRIVERS@+AUDIO_SUBDIRS = @AUDIO_SUBDIRS@+AUTOCONF = @AUTOCONF@+AUTOHEADER = @AUTOHEADER@+AUTOMAKE = @AUTOMAKE@+AWK = @AWK@+CC = @CC@+CCAS = @CCAS@+CCASFLAGS = @CCASFLAGS@+CCDEPMODE = @CCDEPMODE@+CDROM_DRIVERS = @CDROM_DRIVERS@+CDROM_SUBDIRS = @CDROM_SUBDIRS@+CFLAGS = @CFLAGS@+CPP = @CPP@+CPPFLAGS = @CPPFLAGS@+CXX = @CXX@+CXXCPP = @CXXCPP@+CXXDEPMODE = @CXXDEPMODE@+CXXFLAGS = @CXXFLAGS@+CYGPATH_W = @CYGPATH_W@+DEFS = @DEFS@+DEPDIR = @DEPDIR@+DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@+DIRECTFB_LIBS = @DIRECTFB_LIBS@+DLLTOOL = @DLLTOOL@+ECHO = @ECHO@+ECHO_C = @ECHO_C@+ECHO_N = @ECHO_N@+ECHO_T = @ECHO_T@+EGREP = @EGREP@+ENABLE_SHARED_FALSE = @ENABLE_SHARED_FALSE@+ENABLE_SHARED_TRUE = @ENABLE_SHARED_TRUE@+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@+ESD_CFLAGS = @ESD_CFLAGS@⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -