From 8113c0071291a8e6dfade63ce16fb3dadb424d4c Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 30 Mar 2014 15:06:08 +0200 Subject: [PATCH] Merged CMake platform file picking blocks. --- src/CMakeLists.txt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 74e58eab..f6ac6469 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,19 +24,17 @@ elseif (_GLFW_WIN32) win32_init.c win32_monitor.c win32_time.c win32_tls.c win32_window.c winmm_joystick.c) elseif (_GLFW_X11) - set(glfw_HEADERS ${common_HEADERS} x11_platform.h posix_tls.h) + set(glfw_HEADERS ${common_HEADERS} x11_platform.h linux_joystick.h + posix_time.h posix_tls.h) set(glfw_SOURCES ${common_SOURCES} x11_clipboard.c x11_gamma.c x11_init.c - x11_monitor.c x11_window.c x11_unicode.c posix_tls.c) + x11_monitor.c x11_window.c x11_unicode.c linux_joystick.c + posix_time.c posix_tls.c) elseif (_GLFW_WAYLAND) - set(glfw_HEADERS ${common_HEADERS} wayland_platform.h posix_tls.h) + set(glfw_HEADERS ${common_HEADERS} wayland_platform.h linux_joystick.h + posix_time.h posix_tls.h) set(glfw_SOURCES ${common_SOURCES} wayland_clipboard.c wayland_gamma.c wayland_init.c wayland_monitor.c wayland_window.c - posix_tls.c) -endif() - -if (_GLFW_X11 OR _GLFW_WAYLAND) - list(APPEND glfw_HEADERS linux_joystick.h posix_time.h) - list(APPEND glfw_SOURCES linux_joystick.c posix_time.c) + linux_joystick.c posix_time.c posix_tls.c) endif() if (_GLFW_EGL)