Skip to content
Permalink
Browse files

Renamed things named after BeOS to be named after Haiku instead.

  • Loading branch information
icculus committed Nov 14, 2013
1 parent 85dd689 commit 00003e8c00746bdb76d44bca20509317a942c6ed
Showing with 176 additions and 167 deletions.
  1. +12 −10 CMakeLists.txt
  2. +1 −1 cmake/sdlchecks.cmake
  3. +29 −23 configure
  4. +32 −27 configure.in
  5. +7 −7 include/SDL_config.h.cmake
  6. +7 −7 include/SDL_config.h.in
  7. +0 −4 include/SDL_platform.h
  8. +1 −1 include/SDL_thread.h
  9. +0 −2 src/SDL.c
  10. +3 −3 src/audio/SDL_audio.c
  11. +18 −18 src/audio/{baudio/SDL_beaudio.cc → haiku/SDL_haikuaudio.cc}
  12. 0 src/audio/{baudio/SDL_beaudio.h → haiku/SDL_haikuaudio.h}
  13. +2 −2 src/events/SDL_sysevents.h
  14. +3 −3 src/filesystem/{beos → haiku}/SDL_sysfilesystem.cc
  15. +5 −4 src/joystick/{beos/SDL_bejoystick.cc → haiku/SDL_haikujoystick.cc}
  16. +3 −3 src/loadso/{beos → haiku}/SDL_sysloadso.c
  17. +3 −3 src/main/{beos → haiku}/SDL_BApp.h
  18. +3 −3 src/main/{beos → haiku}/SDL_BeApp.cc
  19. 0 src/main/{beos → haiku}/SDL_BeApp.h
  20. +3 −3 src/power/SDL_power.c
  21. +4 −3 src/power/{beos → haiku}/SDL_syspower.c
  22. +3 −3 src/timer/{beos → haiku}/SDL_systimer.c
  23. +2 −2 src/video/SDL_sysvideo.h
  24. +2 −2 src/video/SDL_video.c
  25. +2 −2 src/video/{bwindow → haiku}/SDL_BWin.h
  26. +2 −2 src/video/{bwindow → haiku}/SDL_bclipboard.cc
  27. 0 src/video/{bwindow → haiku}/SDL_bclipboard.h
  28. +2 −2 src/video/{bwindow → haiku}/SDL_bevents.cc
  29. 0 src/video/{bwindow → haiku}/SDL_bevents.h
  30. +3 −3 src/video/{bwindow → haiku}/SDL_bframebuffer.cc
  31. 0 src/video/{bwindow → haiku}/SDL_bframebuffer.h
  32. +2 −2 src/video/{bwindow → haiku}/SDL_bkeyboard.cc
  33. 0 src/video/{bwindow → haiku}/SDL_bkeyboard.h
  34. +3 −3 src/video/{bwindow → haiku}/SDL_bmodes.cc
  35. 0 src/video/{bwindow → haiku}/SDL_bmodes.h
  36. +3 −3 src/video/{bwindow → haiku}/SDL_bopengl.cc
  37. 0 src/video/{bwindow → haiku}/SDL_bopengl.h
  38. +4 −4 src/video/{bwindow → haiku}/SDL_bvideo.cc
  39. +1 −1 src/video/{bwindow → haiku}/SDL_bvideo.h
  40. +5 −5 src/video/{bwindow → haiku}/SDL_bwindow.cc
  41. 0 src/video/{bwindow → haiku}/SDL_bwindow.h
  42. +1 −1 test/configure
  43. +2 −2 test/configure.in
  44. +1 −1 visualtest/configure
  45. +2 −2 visualtest/configure.in
@@ -95,8 +95,10 @@ elseif(APPLE)
set(MACOSX TRUE)
endif()
# TODO: iOS?
elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku.*|BeOS.*")
set(BEOS TRUE)
elseif(CMAKE_SYSTEM_NAME MATCHES "BeOS.*")
message_error("BeOS support has been removed as of SDL 2.0.2.")
elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku.*")
set(HAIKU TRUE)
endif()

# Don't mistake osx for unix
@@ -308,9 +310,9 @@ if(USE_GCC)

check_c_compiler_flag(-Wall HAVE_GCC_WALL)
if(HAVE_GCC_WALL)
if(CMAKE_SYSTEM_NAME MATCHES "Haiku|BeOS")
if(HAIKU)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar")
endif(CMAKE_SYSTEM_NAME MATCHES "Haiku|BeOS")
endif(HAIKU)
endif(HAVE_GCC_WALL)
endif(USE_GCC)

@@ -991,15 +993,15 @@ elseif(APPLE)
endif(SDL_VIDEO)

CheckPTHREAD()
elseif(BEOS)
elseif(HAIKU)
if(SDL_VIDEO)
set(SDL_VIDEO_DRIVER_BWINDOW 1)
file(GLOB BWINDOW_SOURCES ${SDL2_SOURCE_DIR}/src/video/bwindow/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${BWINDOW_SOURCES})
set(SDL_VIDEO_DRIVER_HAIKU 1)
file(GLOB HAIKUVIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/haiku/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${HAIKUVIDEO_SOURCES})
set(HAVE_SDL_VIDEO TRUE)

set(SDL_FILESYSTEM_BEOS 1)
file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/beos/*.cc)
set(SDL_FILESYSTEM_HAIKU 1)
file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/haiku/*.cc)
set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
set(HAVE_SDL_FILESYSTEM TRUE)

@@ -638,7 +638,7 @@ macro(CheckPTHREAD)
elseif(HPUX)
set(PTHREAD_CFLAGS "-D_REENTRANT")
set(PTHREAD_LDFLAGS "-L/usr/lib -pthread")
elseif(BEOS)
elseif(HAIKU)
set(PTHREAD_CFLAGS "-D_REENTRANT")
set(PTHREAD_LDFLAGS "")
else()
@@ -15950,7 +15950,7 @@ $as_echo "$have_gcc_mmd_mt" >&6; }
fi
fi

# Actually this doesn't work on OpenBSD and BeOS
# Actually this doesn't work on OpenBSD
#AC_MSG_CHECKING(for linker option --no-undefined)
#have_no_undefined=no
#save_LDFLAGS="$LDFLAGS"
$as_echo_n "checking for necessary GCC -Wno-multichar option... " >&6; }
need_gcc_Wno_multichar=no
case "$host" in
*-*-beos* | *-*-haiku*)
*-*-haiku*)
need_gcc_Wno_multichar=yes
;;
esac
fi
}

CheckBWINDOW()
CheckHaikuVideo()
{
if test x$enable_video = xyes; then

$as_echo "#define SDL_VIDEO_DRIVER_BWINDOW 1" >>confdefs.h
$as_echo "#define SDL_VIDEO_DRIVER_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
SOURCES="$SOURCES $srcdir/src/video/haiku/*.cc"
have_video=yes
fi
}
fi
}

CheckBeGL()
CheckHaikuGL()
{
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then

$as_echo "#define SDL_VIDEO_OPENGL 1" >>confdefs.h


$as_echo "#define SDL_VIDEO_OPENGL_BGL 1" >>confdefs.h
$as_echo "#define SDL_VIDEO_OPENGL_HAIKU 1" >>confdefs.h


$as_echo "#define SDL_VIDEO_RENDER_OGL 1" >>confdefs.h
fi
;;

*-*-beos*)
as_fn_error $? "
*** BeOS support has been removed as of SDL 2.0.2.
" "$LINENO" 5
;;

*-*-haiku*)
ARCH=beos
ARCH=haiku
ac_default_prefix=/boot/common
CheckDummyVideo
CheckDiskAudio
CheckDummyAudio
CheckBWINDOW
CheckBeGL
CheckHaikuVideo
CheckHaikuGL
CheckPTHREAD

# Set up files for the audio library
if test x$enable_audio = xyes; then

$as_echo "#define SDL_AUDIO_DRIVER_BEOSAUDIO 1" >>confdefs.h
$as_echo "#define SDL_AUDIO_DRIVER_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc"
SOURCES="$SOURCES $srcdir/src/audio/haiku/*.cc"
have_audio=yes
fi
# Set up files for the joystick library
if test x$enable_joystick = xyes; then

$as_echo "#define SDL_JOYSTICK_BEOS 1" >>confdefs.h
$as_echo "#define SDL_JOYSTICK_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
SOURCES="$SOURCES $srcdir/src/joystick/haiku/*.cc"
have_joystick=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then

$as_echo "#define SDL_TIMER_BEOS 1" >>confdefs.h
$as_echo "#define SDL_TIMER_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
SOURCES="$SOURCES $srcdir/src/timer/haiku/*.c"
have_timers=yes
fi
# Set up files for the shared object loading library
if test x$enable_loadso = xyes; then

$as_echo "#define SDL_LOADSO_BEOS 1" >>confdefs.h
$as_echo "#define SDL_LOADSO_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
SOURCES="$SOURCES $srcdir/src/loadso/haiku/*.c"
have_loadso=yes
fi
# Set up files for the system power library
if test x$enable_power = xyes; then

$as_echo "#define SDL_POWER_BEOS 1" >>confdefs.h
$as_echo "#define SDL_POWER_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/power/beos/*.c"
SOURCES="$SOURCES $srcdir/src/power/haiku/*.c"
have_power=yes
fi
# Set up files for the system filesystem library
if test x$enable_filesystem = xyes; then

$as_echo "#define SDL_FILESYSTEM_BEOS 1" >>confdefs.h
$as_echo "#define SDL_FILESYSTEM_HAIKU 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/filesystem/beos/*.cc"
SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
have_filesystem=yes
fi
# The BeOS platform requires special setup.
SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
;;
arm*-apple-darwin*)
@@ -204,7 +204,7 @@ if test x$enable_dependency_tracking = xyes; then
fi
fi

# Actually this doesn't work on OpenBSD and BeOS
# Actually this doesn't work on OpenBSD
#AC_MSG_CHECKING(for linker option --no-undefined)
#have_no_undefined=no
#save_LDFLAGS="$LDFLAGS"
@@ -1097,7 +1097,7 @@ CheckWarnAll()
AC_MSG_CHECKING(for necessary GCC -Wno-multichar option)
need_gcc_Wno_multichar=no
case "$host" in
*-*-beos* | *-*-haiku*)
*-*-haiku*)
need_gcc_Wno_multichar=yes
;;
esac
@@ -1474,12 +1474,12 @@ AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[d
fi
}

dnl Set up the BWindow video driver if enabled
CheckBWINDOW()
dnl Set up the Haiku video driver if enabled
CheckHaikuVideo()
{
if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW, 1, [ ])
SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
AC_DEFINE(SDL_VIDEO_DRIVER_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/video/haiku/*.cc"
have_video=yes
fi
}
@@ -1743,12 +1743,12 @@ CheckWINDOWSGL()
fi
}

dnl Check for BeOS OpenGL
CheckBeGL()
dnl Check for Haiku OpenGL
CheckHaikuGL()
{
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
AC_DEFINE(SDL_VIDEO_OPENGL, 1, [ ])
AC_DEFINE(SDL_VIDEO_OPENGL_BGL, 1, [ ])
AC_DEFINE(SDL_VIDEO_OPENGL_HAIKU, 1, [ ])
AC_DEFINE(SDL_VIDEO_RENDER_OGL, 1, [ ])
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
fi
@@ -2619,55 +2619,60 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
;;

dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan.
dnl *-*-beos*)
*-*-beos*)
AC_MSG_ERROR([
*** BeOS support has been removed as of SDL 2.0.2.
])
;;

*-*-haiku*)
ARCH=beos
ARCH=haiku
ac_default_prefix=/boot/common
CheckDummyVideo
CheckDiskAudio
CheckDummyAudio
CheckBWINDOW
CheckBeGL
CheckHaikuVideo
CheckHaikuGL
CheckPTHREAD

# Set up files for the audio library
if test x$enable_audio = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_BEOSAUDIO, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc"
AC_DEFINE(SDL_AUDIO_DRIVER_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/haiku/*.cc"
have_audio=yes
fi
# Set up files for the joystick library
if test x$enable_joystick = xyes; then
AC_DEFINE(SDL_JOYSTICK_BEOS, 1, [ ])
SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
AC_DEFINE(SDL_JOYSTICK_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/joystick/haiku/*.cc"
have_joystick=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_BEOS, 1, [ ])
SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
AC_DEFINE(SDL_TIMER_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/timer/haiku/*.c"
have_timers=yes
fi
# Set up files for the shared object loading library
if test x$enable_loadso = xyes; then
AC_DEFINE(SDL_LOADSO_BEOS, 1, [ ])
SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
AC_DEFINE(SDL_LOADSO_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/loadso/haiku/*.c"
have_loadso=yes
fi
# Set up files for the system power library
if test x$enable_power = xyes; then
AC_DEFINE(SDL_POWER_BEOS, 1, [ ])
SOURCES="$SOURCES $srcdir/src/power/beos/*.c"
AC_DEFINE(SDL_POWER_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/power/haiku/*.c"
have_power=yes
fi
# Set up files for the system filesystem library
if test x$enable_filesystem = xyes; then
AC_DEFINE(SDL_FILESYSTEM_BEOS, 1, [ ])
SOURCES="$SOURCES $srcdir/src/filesystem/beos/*.cc"
AC_DEFINE(SDL_FILESYSTEM_HAIKU, 1, [ ])
SOURCES="$SOURCES $srcdir/src/filesystem/haiku/*.cc"
have_filesystem=yes
fi
# The BeOS platform requires special setup.
SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
# The Haiku platform requires special setup.
SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
;;
arm*-apple-darwin*)
@@ -191,7 +191,7 @@
#cmakedefine SDL_AUDIO_DRIVER_ARTS_DYNAMIC @SDL_AUDIO_DRIVER_ARTS_DYNAMIC@
#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO @SDL_AUDIO_DRIVER_PULSEAUDIO@
#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC @SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC@
#cmakedefine SDL_AUDIO_DRIVER_BEOSAUDIO @SDL_AUDIO_DRIVER_BEOSAUDIO@
#cmakedefine SDL_AUDIO_DRIVER_HAIKU @SDL_AUDIO_DRIVER_HAIKU@
#cmakedefine SDL_AUDIO_DRIVER_BSD @SDL_AUDIO_DRIVER_BSD@
#cmakedefine SDL_AUDIO_DRIVER_COREAUDIO @SDL_AUDIO_DRIVER_COREAUDIO@
#cmakedefine SDL_AUDIO_DRIVER_DISK @SDL_AUDIO_DRIVER_DISK@
@@ -216,7 +216,7 @@
/* Enable various input drivers */
#cmakedefine SDL_INPUT_LINUXEV @SDL_INPUT_LINUXEV@
#cmakedefine SDL_INPUT_TSLIB @SDL_INPUT_TSLIB@
#cmakedefine SDL_JOYSTICK_BEOS @SDL_JOYSTICK_BEOS@
#cmakedefine SDL_JOYSTICK_HAIKU @SDL_JOYSTICK_HAIKU@
#cmakedefine SDL_JOYSTICK_DINPUT @SDL_JOYSTICK_DINPUT@
#cmakedefine SDL_JOYSTICK_DUMMY @SDL_JOYSTICK_DUMMY@
#cmakedefine SDL_JOYSTICK_IOKIT @SDL_JOYSTICK_IOKIT@
@@ -230,7 +230,7 @@
#cmakedefine SDL_HAPTIC_DINPUT @SDL_HAPTIC_DINPUT@

/* Enable various shared object loading systems */
#cmakedefine SDL_LOADSO_BEOS @SDL_LOADSO_BEOS@
#cmakedefine SDL_LOADSO_HAIKU @SDL_LOADSO_HAIKU@
#cmakedefine SDL_LOADSO_DLOPEN @SDL_LOADSO_DLOPEN@
#cmakedefine SDL_LOADSO_DUMMY @SDL_LOADSO_DUMMY@
#cmakedefine SDL_LOADSO_LDG @SDL_LOADSO_LDG@
@@ -243,14 +243,14 @@
#cmakedefine SDL_THREAD_WINDOWS @SDL_THREAD_WINDOWS@

/* Enable various timer systems */
#cmakedefine SDL_TIMER_BEOS @SDL_TIMER_BEOS@
#cmakedefine SDL_TIMER_HAIKU @SDL_TIMER_HAIKU@
#cmakedefine SDL_TIMER_DUMMY @SDL_TIMER_DUMMY@
#cmakedefine SDL_TIMER_UNIX @SDL_TIMER_UNIX@
#cmakedefine SDL_TIMER_WINDOWS @SDL_TIMER_WINDOWS@
#cmakedefine SDL_TIMER_WINCE @SDL_TIMER_WINCE@

/* Enable various video drivers */
#cmakedefine SDL_VIDEO_DRIVER_BWINDOW @SDL_VIDEO_DRIVER_BWINDOW@
#cmakedefine SDL_VIDEO_DRIVER_HAIKU @SDL_VIDEO_DRIVER_HAIKU@
#cmakedefine SDL_VIDEO_DRIVER_COCOA @SDL_VIDEO_DRIVER_COCOA@
#cmakedefine SDL_VIDEO_DRIVER_DIRECTFB @SDL_VIDEO_DRIVER_DIRECTFB@
#cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@
@@ -300,11 +300,11 @@
#cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@
#cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@
#cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@
#cmakedefine SDL_POWER_BEOS @SDL_POWER_BEOS@
#cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@
#cmakedefine SDL_POWER_HARDWIRED @SDL_POWER_HARDWIRED@

/* Enable system filesystem support */
#cmakedefine SDL_FILESYSTEM_BEOS @SDL_FILESYSTEM_BEOS@
#cmakedefine SDL_FILESYSTEM_HAIKU @SDL_FILESYSTEM_HAIKU@
#cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@
#cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@
#cmakedefine SDL_FILESYSTEM_UNIX @SDL_FILESYSTEM_UNIX@

0 comments on commit 00003e8

Please sign in to comment.