Renamed things named after BeOS to be named after Haiku instead.
--HG-- rename : src/audio/baudio/SDL_beaudio.cc => src/audio/haiku/SDL_haikuaudio.cc rename : src/audio/baudio/SDL_beaudio.h => src/audio/haiku/SDL_haikuaudio.h rename : src/filesystem/beos/SDL_sysfilesystem.cc => src/filesystem/haiku/SDL_sysfilesystem.cc rename : src/joystick/beos/SDL_bejoystick.cc => src/joystick/haiku/SDL_haikujoystick.cc rename : src/loadso/beos/SDL_sysloadso.c => src/loadso/haiku/SDL_sysloadso.c rename : src/main/beos/SDL_BApp.h => src/main/haiku/SDL_BApp.h rename : src/main/beos/SDL_BeApp.cc => src/main/haiku/SDL_BeApp.cc rename : src/main/beos/SDL_BeApp.h => src/main/haiku/SDL_BeApp.h rename : src/power/beos/SDL_syspower.c => src/power/haiku/SDL_syspower.c rename : src/timer/beos/SDL_systimer.c => src/timer/haiku/SDL_systimer.c rename : src/video/bwindow/SDL_BWin.h => src/video/haiku/SDL_BWin.h rename : src/video/bwindow/SDL_bclipboard.cc => src/video/haiku/SDL_bclipboard.cc rename : src/video/bwindow/SDL_bclipboard.h => src/video/haiku/SDL_bclipboard.h rename : src/video/bwindow/SDL_bevents.cc => src/video/haiku/SDL_bevents.cc rename : src/video/bwindow/SDL_bevents.h => src/video/haiku/SDL_bevents.h rename : src/video/bwindow/SDL_bframebuffer.cc => src/video/haiku/SDL_bframebuffer.cc rename : src/video/bwindow/SDL_bframebuffer.h => src/video/haiku/SDL_bframebuffer.h rename : src/video/bwindow/SDL_bkeyboard.cc => src/video/haiku/SDL_bkeyboard.cc rename : src/video/bwindow/SDL_bkeyboard.h => src/video/haiku/SDL_bkeyboard.h rename : src/video/bwindow/SDL_bmodes.cc => src/video/haiku/SDL_bmodes.cc rename : src/video/bwindow/SDL_bmodes.h => src/video/haiku/SDL_bmodes.h rename : src/video/bwindow/SDL_bopengl.cc => src/video/haiku/SDL_bopengl.cc rename : src/video/bwindow/SDL_bopengl.h => src/video/haiku/SDL_bopengl.h rename : src/video/bwindow/SDL_bvideo.cc => src/video/haiku/SDL_bvideo.cc rename : src/video/bwindow/SDL_bvideo.h => src/video/haiku/SDL_bvideo.h rename : src/video/bwindow/SDL_bwindow.cc => src/video/haiku/SDL_bwindow.cc rename : src/video/bwindow/SDL_bwindow.h => src/video/haiku/SDL_bwindow.h extra : rebase_source : afd5a42647878e283dbee3a666cef2214f0e7941
This commit is contained in:
parent
6608608177
commit
30c46bacc8
45 changed files with 176 additions and 167 deletions
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue