configure
changeset 7981 6d538bc1b395
parent 7977 5272ae8fccd7
child 7985 1e2d63f57e04
     1.1 --- a/configure	Thu Nov 14 10:19:07 2013 -0300
     1.2 +++ b/configure	Thu Nov 14 11:51:24 2013 -0500
     1.3 @@ -15950,7 +15950,7 @@
     1.4      fi
     1.5  fi
     1.6  
     1.7 -# Actually this doesn't work on OpenBSD and BeOS
     1.8 +# Actually this doesn't work on OpenBSD
     1.9  #AC_MSG_CHECKING(for linker option --no-undefined)
    1.10  #have_no_undefined=no
    1.11  #save_LDFLAGS="$LDFLAGS"
    1.12 @@ -18598,7 +18598,7 @@
    1.13  $as_echo_n "checking for necessary GCC -Wno-multichar option... " >&6; }
    1.14          need_gcc_Wno_multichar=no
    1.15          case "$host" in
    1.16 -            *-*-beos* | *-*-haiku*)
    1.17 +            *-*-haiku*)
    1.18                  need_gcc_Wno_multichar=yes
    1.19                  ;;
    1.20          esac
    1.21 @@ -20124,13 +20124,13 @@
    1.22      fi
    1.23  }
    1.24  
    1.25 -CheckBWINDOW()
    1.26 +CheckHaikuVideo()
    1.27  {
    1.28      if test x$enable_video = xyes; then
    1.29  
    1.30 -$as_echo "#define SDL_VIDEO_DRIVER_BWINDOW 1" >>confdefs.h
    1.31 -
    1.32 -        SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
    1.33 +$as_echo "#define SDL_VIDEO_DRIVER_HAIKU 1" >>confdefs.h
    1.34 +
    1.35 +        SOURCES="$SOURCES $srcdir/src/video/haiku/*.cc"
    1.36          have_video=yes
    1.37      fi
    1.38  }
    1.39 @@ -20680,14 +20680,14 @@
    1.40      fi
    1.41  }
    1.42  
    1.43 -CheckBeGL()
    1.44 +CheckHaikuGL()
    1.45  {
    1.46      if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
    1.47  
    1.48  $as_echo "#define SDL_VIDEO_OPENGL 1" >>confdefs.h
    1.49  
    1.50  
    1.51 -$as_echo "#define SDL_VIDEO_OPENGL_BGL 1" >>confdefs.h
    1.52 +$as_echo "#define SDL_VIDEO_OPENGL_HAIKU 1" >>confdefs.h
    1.53  
    1.54  
    1.55  $as_echo "#define SDL_VIDEO_RENDER_OGL 1" >>confdefs.h
    1.56 @@ -22399,66 +22399,72 @@
    1.57          fi
    1.58          ;;
    1.59  
    1.60 +        *-*-beos*)
    1.61 +        as_fn_error $? "
    1.62 +*** BeOS support has been removed as of SDL 2.0.2.
    1.63 +        " "$LINENO" 5
    1.64 +        ;;
    1.65  
    1.66      *-*-haiku*)
    1.67 -        ARCH=beos
    1.68 +        ARCH=haiku
    1.69          ac_default_prefix=/boot/common
    1.70          CheckDummyVideo
    1.71          CheckDiskAudio
    1.72          CheckDummyAudio
    1.73 -        CheckBWINDOW
    1.74 -        CheckBeGL
    1.75 +        CheckHaikuVideo
    1.76 +        CheckHaikuGL
    1.77          CheckPTHREAD
    1.78 +
    1.79          # Set up files for the audio library
    1.80          if test x$enable_audio = xyes; then
    1.81  
    1.82 -$as_echo "#define SDL_AUDIO_DRIVER_BEOSAUDIO 1" >>confdefs.h
    1.83 -
    1.84 -            SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc"
    1.85 +$as_echo "#define SDL_AUDIO_DRIVER_HAIKU 1" >>confdefs.h
    1.86 +
    1.87 +            SOURCES="$SOURCES $srcdir/src/audio/haiku/*.cc"
    1.88              have_audio=yes
    1.89          fi
    1.90          # Set up files for the joystick library
    1.91          if test x$enable_joystick = xyes; then
    1.92  
    1.93 -$as_echo "#define SDL_JOYSTICK_BEOS 1" >>confdefs.h
    1.94 -
    1.95 -            SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
    1.96 +$as_echo "#define SDL_JOYSTICK_HAIKU 1" >>confdefs.h
    1.97 +
    1.98 +            SOURCES="$SOURCES $srcdir/src/joystick/haiku/*.cc"
    1.99              have_joystick=yes
   1.100          fi
   1.101          # Set up files for the timer library
   1.102          if test x$enable_timers = xyes; then
   1.103  
   1.104 -$as_echo "#define SDL_TIMER_BEOS 1" >>confdefs.h
   1.105 -
   1.106 -            SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
   1.107 +$as_echo "#define SDL_TIMER_HAIKU 1" >>confdefs.h
   1.108 +
   1.109 +            SOURCES="$SOURCES $srcdir/src/timer/haiku/*.c"
   1.110              have_timers=yes
   1.111          fi
   1.112          # Set up files for the shared object loading library
   1.113          if test x$enable_loadso = xyes; then
   1.114  
   1.115 -$as_echo "#define SDL_LOADSO_BEOS 1" >>confdefs.h
   1.116 -
   1.117 -            SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
   1.118 +$as_echo "#define SDL_LOADSO_HAIKU 1" >>confdefs.h
   1.119 +
   1.120 +            SOURCES="$SOURCES $srcdir/src/loadso/haiku/*.c"
   1.121              have_loadso=yes
   1.122          fi
   1.123          # Set up files for the system power library
   1.124          if test x$enable_power = xyes; then
   1.125  
   1.126 -$as_echo "#define SDL_POWER_BEOS 1" >>confdefs.h
   1.127 -
   1.128 -            SOURCES="$SOURCES $srcdir/src/power/beos/*.c"
   1.129 +$as_echo "#define SDL_POWER_HAIKU 1" >>confdefs.h
   1.130 +
   1.131 +            SOURCES="$SOURCES $srcdir/src/power/haiku/*.c"
   1.132              have_power=yes
   1.133          fi
   1.134          # Set up files for the system filesystem library
   1.135          if test x$enable_filesystem = xyes; then
   1.136  
   1.137 -$as_echo "#define SDL_FILESYSTEM_BEOS 1" >>confdefs.h
   1.138 -
   1.139 -            SOURCES="$SOURCES $srcdir/src/filesystem/beos/*.cc"
   1.140 +$as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h
   1.141 +
   1.142 +            SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
   1.143              have_filesystem=yes
   1.144          fi
   1.145          # The BeOS platform requires special setup.
   1.146 -        SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
   1.147 +        SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
   1.148          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
   1.149          ;;
   1.150      arm*-apple-darwin*)