Commit 7ac827102a29189a6ac85aca06d58e4f1fef649b
2020-04-24T02:06:53
cmake: various Haiku settings were accidentally under "if(SDL_VIDEO)"
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22e4c38..6be75e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1815,18 +1815,6 @@ elseif(HAIKU)
set(SOURCE_FILES ${SOURCE_FILES} ${HAIKUVIDEO_SOURCES})
set(HAVE_SDL_VIDEO TRUE)
- 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)
-
- if(SDL_TIMERS)
- set(SDL_TIMER_HAIKU 1)
- file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/haiku/*.c)
- set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
- set(HAVE_SDL_TIMERS TRUE)
- endif(SDL_TIMERS)
-
if(VIDEO_OPENGL)
# TODO: Use FIND_PACKAGE(OpenGL) instead
set(SDL_VIDEO_OPENGL 1)
@@ -1837,6 +1825,18 @@ elseif(HAIKU)
endif()
endif()
+ 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)
+
+ if(SDL_TIMERS)
+ set(SDL_TIMER_HAIKU 1)
+ file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/haiku/*.c)
+ set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
+ set(HAVE_SDL_TIMERS TRUE)
+ endif()
+
CheckPTHREAD()
elseif(RISCOS)