1.1 --- a/configure.in Thu Apr 26 16:45:43 2001 +0000
1.2 +++ b/configure.in Thu Apr 26 16:50:19 2001 +0000
1.3 @@ -14,9 +14,9 @@
1.4 #
1.5 SDL_MAJOR_VERSION=1
1.6 SDL_MINOR_VERSION=2
1.7 -SDL_MICRO_VERSION=0
1.8 -SDL_INTERFACE_AGE=0
1.9 -SDL_BINARY_AGE=0
1.10 +SDL_MICRO_VERSION=1
1.11 +SDL_INTERFACE_AGE=1
1.12 +SDL_BINARY_AGE=1
1.13 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
1.14
1.15 AC_SUBST(SDL_MAJOR_VERSION)
1.16 @@ -251,6 +251,9 @@
1.17 #ifdef __bsdi__
1.18 #include <sys/soundcard.h>
1.19 #endif
1.20 + #ifdef __OpenBSD__
1.21 + #include <soundcard.h>
1.22 + #endif
1.23 #ifdef __USLC__
1.24 #include <sys/soundcard.h>
1.25 #endif
1.26 @@ -680,6 +683,19 @@
1.27 fi
1.28 }
1.29
1.30 +dnl rcg04172001 Set up the Null video driver.
1.31 +CheckDummyVideo()
1.32 +{
1.33 + AC_ARG_ENABLE(video-dummy,
1.34 +[ --enable-video-dummy use dummy video driver [default=no]],
1.35 + , enable_video_dummy=no)
1.36 + if test x$enable_video_dummy = xyes; then
1.37 + CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"
1.38 + VIDEO_SUBDIRS="$VIDEO_SUBDIRS dummy"
1.39 + VIDEO_DRIVERS="$VIDEO_DRIVERS dummy/libvideo_null.la"
1.40 + fi
1.41 +}
1.42 +
1.43 dnl Check to see if OpenGL support is desired
1.44 AC_ARG_ENABLE(video-opengl,
1.45 [ --enable-video-opengl include OpenGL context creation [default=yes]],
1.46 @@ -1012,6 +1028,7 @@
1.47 case "$target" in
1.48 *-*-linux*)
1.49 ARCH=linux
1.50 + CheckDummyVideo
1.51 CheckNASM
1.52 CheckOSS
1.53 CheckALSA
1.54 @@ -1076,6 +1093,7 @@
1.55 ;;
1.56 *-*-bsdi*)
1.57 ARCH=bsdi
1.58 + CheckDummyVideo
1.59 CheckNASM
1.60 CheckOSS
1.61 CheckNAS
1.62 @@ -1116,6 +1134,7 @@
1.63 ;;
1.64 *-*-freebsd*)
1.65 ARCH=freebsd
1.66 + CheckDummyVideo
1.67 CheckNASM
1.68 CheckOSS
1.69 CheckARTSC
1.70 @@ -1167,6 +1186,7 @@
1.71 ;;
1.72 *-*-netbsd*)
1.73 ARCH=netbsd
1.74 + CheckDummyVideo
1.75 CheckNASM
1.76 CheckOSS
1.77 CheckARTSC
1.78 @@ -1199,7 +1219,11 @@
1.79 COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h)
1.80 COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c)
1.81 COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h)
1.82 - COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c)
1.83 + if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then
1.84 + COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c)
1.85 + else
1.86 + COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c)
1.87 + fi
1.88 COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h)
1.89 COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c)
1.90 COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h)
1.91 @@ -1213,6 +1237,8 @@
1.92 ;;
1.93 *-*-openbsd*)
1.94 ARCH=openbsd
1.95 + CFLAGS="$CFLAGS -Dunix"
1.96 + CheckDummyVideo
1.97 CheckNASM
1.98 CheckOSS
1.99 CheckARTSC
1.100 @@ -1261,6 +1287,7 @@
1.101 ;;
1.102 *-*-sysv5*)
1.103 ARCH=sysv5
1.104 + CheckDummyVideo
1.105 CheckNASM
1.106 CheckOSS
1.107 CheckARTSC
1.108 @@ -1306,6 +1333,8 @@
1.109 ;;
1.110 *-*-solaris*)
1.111 ARCH=solaris
1.112 + CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86
1.113 + CheckDummyVideo
1.114 CheckNASM
1.115 CheckARTSC
1.116 CheckESD
1.117 @@ -1350,6 +1379,7 @@
1.118 ;;
1.119 *-*-irix*)
1.120 ARCH=irix
1.121 + CheckDummyVideo
1.122 CheckNAS
1.123 CheckX11
1.124 CheckAAlib
1.125 @@ -1407,6 +1437,7 @@
1.126 ;;
1.127 *-*-hpux*)
1.128 ARCH=hpux
1.129 + CheckDummyVideo
1.130 CheckNAS
1.131 CheckX11
1.132 CheckGGI
1.133 @@ -1449,6 +1480,7 @@
1.134 ;;
1.135 *-*-aix*)
1.136 ARCH=aix
1.137 + CheckDummyVideo
1.138 CheckNAS
1.139 CheckX11
1.140 CheckGGI
1.141 @@ -1490,6 +1522,7 @@
1.142 ;;
1.143 *-*-osf*)
1.144 ARCH=osf
1.145 + CheckDummyVideo
1.146 CheckNAS
1.147 CheckX11
1.148 CheckGGI
1.149 @@ -1532,6 +1565,7 @@
1.150 ;;
1.151 *-*-qnx*)
1.152 ARCH=qnx
1.153 + CheckDummyVideo
1.154 CheckNAS
1.155 CheckPHOTON
1.156 CheckX11
1.157 @@ -1581,8 +1615,11 @@
1.158 ac_default_prefix=/usr/local/cross-tools/i386-mingw32msvc
1.159 else
1.160 # Look for the location of the tools and install there
1.161 - ac_default_prefix=$BUILD_PREFIX
1.162 + if [ "$BUILD_PREFIX" != "" ]; then
1.163 + ac_default_prefix=$BUILD_PREFIX
1.164 + fi
1.165 fi
1.166 + CheckDummyVideo
1.167 CheckWIN32
1.168 CheckDIRECTX
1.169 CheckNASM
1.170 @@ -1623,11 +1660,22 @@
1.171 fi
1.172 # The Win32 platform requires special setup
1.173 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
1.174 - SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
1.175 + case "$target" in
1.176 + *-*-cygwin*)
1.177 + CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix"
1.178 + SDL_CFLAGS="$SDL_CFLAGS -I/usr/include/mingw -DWIN32 -Uunix"
1.179 + LIBS="$LIBS -mno-cygwin"
1.180 + SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows -mno-cygwin"
1.181 + ;;
1.182 + *-*-mingw32*)
1.183 + SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
1.184 + ;;
1.185 + esac
1.186 ;;
1.187 *-*-beos*)
1.188 ARCH=beos
1.189 ac_default_prefix=/boot/develop/tools/gnupro
1.190 + CheckDummyVideo
1.191 CheckNASM
1.192 CheckBWINDOW
1.193 CheckBeGL
1.194 @@ -1672,6 +1720,7 @@
1.195 # use it at present, but Apple is working on a X-to-9 compiler
1.196 # for which this case would be handy.
1.197 ARCH=macos
1.198 + CheckDummyVideo
1.199 CheckTOOLBOX
1.200 CheckMacGL
1.201 # Set up files for the main() stub
1.202 @@ -1714,6 +1763,7 @@
1.203 # just the OS X kernel sans upper layers like Carbon. But
1.204 # config.guess comes back with "darwin", so go with the flow.
1.205 ARCH=macos
1.206 + CheckDummyVideo
1.207 CheckCARBON
1.208 CheckMacGL
1.209 CheckPTHREAD
1.210 @@ -1790,6 +1840,10 @@
1.211 SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
1.212 fi
1.213
1.214 +if test $ARCH = openbsd; then
1.215 + SDL_RLD_FLAGS="-Wl,-R\${exec_prefix}/lib -Wl,-R\${X11BASE}/lib"
1.216 +fi
1.217 +
1.218 dnl Output the video drivers we use
1.219 if test x$enable_video = xtrue; then
1.220 if test "$VIDEO_SUBDIRS" = ""; then
1.221 @@ -1873,6 +1927,7 @@
1.222 src/video/windx5/Makefile
1.223 src/video/bwindow/Makefile
1.224 src/video/photon/Makefile
1.225 +src/video/dummy/Makefile
1.226 src/events/Makefile
1.227 src/joystick/Makefile
1.228 src/joystick/beos/Makefile