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.40 by gbeauche, 2005-05-13T11:13:26Z vs.
Revision 1.41 by gbeauche, 2005-05-13T17:32:13Z

# Line 21 | Line 21 | AC_ARG_ENABLE(fbdev-dga,     [  --enable
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-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
25   AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
26   AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
27  
# Line 153 | Line 154 | if [[ "x$WANT_SDL" = "xyes" ]]; then
154        ;;
155      *)
156        sdl_cflags=`$sdl_config --cflags`
157 <      sdl_libs=`$sdl_config --libs`
157 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
158 >        sdl_libs=`$sdl_config --static-libs`
159 >      else
160 >        sdl_libs=`$sdl_config --libs`
161 >      fi
162        ;;
163      esac
164      CFLAGS="$CFLAGS $sdl_cflags"
# Line 406 | Line 411 | SERIALSRC=serial_unix.cpp
411   ETHERSRC=../dummy/ether_dummy.cpp
412   SCSISRC=../dummy/scsi_dummy.cpp
413   AUDIOSRC=../dummy/audio_dummy.cpp
414 + EXTFSSRC=extfs_unix.cpp
415   EXTRASYSSRCS=
416   CAN_NATIVE_M68K=no
417   case "$target_os" in
# Line 466 | Line 472 | darwin*)
472    if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
473      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
474    fi
475 +  if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
476 +    EXTFSSRC=../MacOSX/extfs_macosx.mm
477 +  fi
478    ;;
479   cygwin*)
480    SERIALSRC="../dummy/serial_dummy.cpp"
# Line 516 | Line 525 | if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
525    ETHERSRC=../dummy/ether_dummy.cpp
526    AUDIOSRC=../dummy/audio_dummy.cpp
527   fi
528 < SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
528 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
529  
530   dnl Define a macro that translates a yesno-variable into a C macro definition
531   dnl to be put into the config.h file

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines