CMakeLists.txt
changeset 7981 6d538bc1b395
parent 7977 5272ae8fccd7
child 7999 2c9aedfba740
     1.1 --- a/CMakeLists.txt	Thu Nov 14 10:19:07 2013 -0300
     1.2 +++ b/CMakeLists.txt	Thu Nov 14 11:51:24 2013 -0500
     1.3 @@ -95,8 +95,10 @@
     1.4      set(MACOSX TRUE)
     1.5    endif()
     1.6    # TODO: iOS?
     1.7 -elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku.*|BeOS.*")
     1.8 -  set(BEOS TRUE)
     1.9 +elseif(CMAKE_SYSTEM_NAME MATCHES "BeOS.*")
    1.10 +  message_error("BeOS support has been removed as of SDL 2.0.2.")
    1.11 +elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku.*")
    1.12 +  set(HAIKU TRUE)
    1.13  endif()
    1.14  
    1.15  # Don't mistake osx for unix
    1.16 @@ -308,9 +310,9 @@
    1.17  
    1.18    check_c_compiler_flag(-Wall HAVE_GCC_WALL)
    1.19    if(HAVE_GCC_WALL)
    1.20 -    if(CMAKE_SYSTEM_NAME MATCHES "Haiku|BeOS")
    1.21 +    if(HAIKU)
    1.22        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar")
    1.23 -    endif(CMAKE_SYSTEM_NAME MATCHES "Haiku|BeOS")
    1.24 +    endif(HAIKU)
    1.25    endif(HAVE_GCC_WALL)
    1.26  endif(USE_GCC)
    1.27  
    1.28 @@ -991,15 +993,15 @@
    1.29    endif(SDL_VIDEO)
    1.30  
    1.31    CheckPTHREAD()
    1.32 -elseif(BEOS)
    1.33 +elseif(HAIKU)
    1.34    if(SDL_VIDEO)
    1.35 -    set(SDL_VIDEO_DRIVER_BWINDOW 1)
    1.36 -    file(GLOB BWINDOW_SOURCES ${SDL2_SOURCE_DIR}/src/video/bwindow/*.c)
    1.37 -    set(SOURCE_FILES ${SOURCE_FILES} ${BWINDOW_SOURCES})
    1.38 +    set(SDL_VIDEO_DRIVER_HAIKU 1)
    1.39 +    file(GLOB HAIKUVIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/haiku/*.c)
    1.40 +    set(SOURCE_FILES ${SOURCE_FILES} ${HAIKUVIDEO_SOURCES})
    1.41      set(HAVE_SDL_VIDEO TRUE)
    1.42  
    1.43 -    set(SDL_FILESYSTEM_BEOS 1)
    1.44 -    file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/beos/*.cc)
    1.45 +    set(SDL_FILESYSTEM_HAIKU 1)
    1.46 +    file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/haiku/*.cc)
    1.47      set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
    1.48      set(HAVE_SDL_FILESYSTEM TRUE)
    1.49