ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/configure.ac
(Generate patch)

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.25 by gbeauche, 2004-05-09T16:11:45Z vs.
Revision 1.26 by gbeauche, 2004-06-23T14:30:48Z

# Line 20 | Line 20 | AC_ARG_ENABLE(xf86-vidmode,  [  --enable
20   AC_ARG_ENABLE(fbdev-dga,     [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
21   AC_ARG_ENABLE(vosf,          [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
22  
23 + dnl SDL options.
24 + AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
25 +
26   dnl JIT compiler options.
27   AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=no]], [WANT_JIT=$enableval], [WANT_JIT=no])
28   AC_ARG_ENABLE(jit-debug,     [  --enable-jit-debug      activate native code disassemblers [default=no]], [WANT_JIT_DEBUG=$enableval], [WANT_JIT_DEBUG=no])
# Line 123 | Line 126 | dnl Checks for libraries.
126   AC_CHECK_LIB(posix4, sem_init)
127   AC_CHECK_LIB(rt, timer_create)
128  
129 < dnl We need X11.
130 < AC_PATH_XTRA
131 < if [[ "x$no_x" = "xyes" ]]; then
132 <  AC_MSG_ERROR([You need X11 to run Basilisk II.])
133 < fi
134 < CFLAGS="$CFLAGS $X_CFLAGS"
135 < CXXFLAGS="$CXXFLAGS $X_CFLAGS"
136 < LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
129 > dnl Do we need SDL?
130 > WANT_SDL=no
131 > SDL_SUPPORT="none"
132 > if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
133 >  WANT_SDL=yes
134 >  WANT_XF86_DGA=no
135 >  WANT_XF86_VIDMODE=no
136 >  WANT_FBDEV_DGA=no
137 >  SDL_SUPPORT="video"
138 > fi
139 > if [[ "x$WANT_SDL" = "xyes" ]]; then
140 >  AC_PATH_PROG(sdl_config, "sdl-config")
141 >  if [[ -n "$sdl_config" ]]; then
142 >    sdl_cflags=`$sdl_config --cflags`
143 >    sdl_libs=`$sdl_config --libs`
144 >    CFLAGS="$CFLAGS $sdl_cflags"
145 >    CXXFLAGS="$CXXFLAGS $sdl_cflags"
146 >    LIBS="$LIBS $sdl_libs"
147 >  else
148 >    WANT_SDL=no
149 >  fi
150 > fi
151 >
152 > dnl We need X11, if not using SDL.
153 > if [[ "x$WANT_SDL" = "xno" ]]; then
154 >  AC_PATH_XTRA
155 >  if [[ "x$no_x" = "xyes" ]]; then
156 >    AC_MSG_ERROR([You need X11 to run Basilisk II.])
157 >  fi
158 >  CFLAGS="$CFLAGS $X_CFLAGS"
159 >  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
160 >  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
161 > fi
162  
163   dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
164   HAVE_PTHREADS=yes
# Line 385 | Line 413 | irix*)
413  
414    ;;
415   esac
416 + dnl SDL overrides
417 + if [[ "x$WANT_SDL" = "xyes" ]]; then
418 +  AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
419 + fi
420 + if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
421 +  VIDEOSRC="../SDL/video_sdl.cpp"
422 +  AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
423 + else
424 +  VIDEOSRC="video_x.cpp"
425 + fi
426  
427   dnl Use 68k CPU natively?
428   WANT_NATIVE_M68K=no
# Line 400 | Line 438 | if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
438    ETHERSRC=../dummy/ether_dummy.cpp
439    AUDIOSRC=../dummy/audio_dummy.cpp
440   fi
441 < SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
441 > SYSSRCS="$VIDEOSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
442  
443   dnl Define a macro that translates a yesno-variable into a C macro definition
444   dnl to be put into the config.h file
# Line 1204 | Line 1242 | dnl Print summary.
1242   echo
1243   echo Basilisk II configuration summary:
1244   echo
1245 + echo SDL support ............................ : $SDL_SUPPORT
1246   echo XFree86 DGA support .................... : $WANT_XF86_DGA
1247   echo XFree86 VidMode support ................ : $WANT_XF86_VIDMODE
1248   echo fbdev DGA support ...................... : $WANT_FBDEV_DGA

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines