cmake: various Haiku settings were accidentally under "if(SDL_VIDEO)"
authorRyan C. Gordon <icculus@icculus.org>
Fri, 24 Apr 2020 02:06:53 -0400
changeset 13781a564e72e3b2d
parent 13780 207c73377b38
child 13782 0d962fba6f52
cmake: various Haiku settings were accidentally under "if(SDL_VIDEO)"
CMakeLists.txt
     1.1 --- a/CMakeLists.txt	Thu Apr 23 11:13:02 2020 -0700
     1.2 +++ b/CMakeLists.txt	Fri Apr 24 02:06:53 2020 -0400
     1.3 @@ -1815,18 +1815,6 @@
     1.4      set(SOURCE_FILES ${SOURCE_FILES} ${HAIKUVIDEO_SOURCES})
     1.5      set(HAVE_SDL_VIDEO TRUE)
     1.6  
     1.7 -    set(SDL_FILESYSTEM_HAIKU 1)
     1.8 -    file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/haiku/*.cc)
     1.9 -    set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
    1.10 -    set(HAVE_SDL_FILESYSTEM TRUE)
    1.11 -
    1.12 -    if(SDL_TIMERS)
    1.13 -      set(SDL_TIMER_HAIKU 1)
    1.14 -      file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/haiku/*.c)
    1.15 -      set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
    1.16 -      set(HAVE_SDL_TIMERS TRUE)
    1.17 -    endif(SDL_TIMERS)
    1.18 -
    1.19      if(VIDEO_OPENGL)
    1.20        # TODO: Use FIND_PACKAGE(OpenGL) instead
    1.21        set(SDL_VIDEO_OPENGL 1)
    1.22 @@ -1837,6 +1825,18 @@
    1.23      endif()
    1.24    endif()
    1.25  
    1.26 +  set(SDL_FILESYSTEM_HAIKU 1)
    1.27 +  file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/haiku/*.cc)
    1.28 +  set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES})
    1.29 +  set(HAVE_SDL_FILESYSTEM TRUE)
    1.30 +
    1.31 +  if(SDL_TIMERS)
    1.32 +    set(SDL_TIMER_HAIKU 1)
    1.33 +    file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/haiku/*.c)
    1.34 +    set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
    1.35 +    set(HAVE_SDL_TIMERS TRUE)
    1.36 +  endif()
    1.37 +
    1.38    CheckPTHREAD()
    1.39  
    1.40  elseif(RISCOS)