Moved the event stuff in a seperate directory

Author: CodenameLambda

CMakeLists.txt

@@ -4,6 +4,8 @@ add_definitions (-std=c++14 -O0)
 
 set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+add_subdirectory (events)
+
 add_library (ObjSDL
     color_names.cc color.cc color.hh  # color_names provides the values for the named colors
     cursor.cc cursor.hh
@@ -12,15 +14,8 @@ add_library (ObjSDL
     clipboard.cc clipboard.hh
     geometry.hh geometry.cc  # header only
     version.cc version.hh
-    event.cc event.hh
-    window_event.cc window_event.hh
-    keyboard_event.cc keyboard_event.hh
-    mouse_event.cc mouse_event.hh
-    joystick_event.cc joystick_event.hh
-    controller_event.cc controller_event.hh
-    touch_event.cc touch_event.hh
-    various_events.cc various_events.hh
     audio.cc audio.hh
+    keys.cc keys.hh
 )
 
 include (cmake/FindSDL2.cmake)
@@ -29,14 +24,11 @@ find_package (Boost COMPONENTS system REQUIRED)
 find_package (SDL2 REQUIRED)
 
 include_directories (${SDL2_INCLUDE_DIR})
+include_directories (${Boost_INCLUDE_DIRS})
 
 link_directories (${Boost_LIBRARY_DIRS})
 
-if (Boost_FOUND)
-    include_directories (${Boost_INCLUDE_DIRS})
-    target_link_libraries (ObjSDL ${Boost_SYSTEM_LIBRARY})
-endif ()
-
+target_link_libraries (ObjSDL ${Boost_SYSTEM_LIBRARY})
 target_link_libraries (ObjSDL ${SDL2_LIBRARY})
 
 install (TARGETS ObjSDL DESTINATION bin)

events/CMakeLists.txt

@@ -0,0 +1,24 @@
+add_definitions (-std=c++14 -O0)
+
+set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+add_library (ObjSDL_events
+    event.cc event.hh
+    window_event.cc window_event.hh
+    keyboard_event.cc keyboard_event.hh
+    mouse_event.cc mouse_event.hh
+    joystick_event.cc joystick_event.hh
+    controller_event.cc controller_event.hh
+    touch_event.cc touch_event.hh
+    various_events.cc various_events.hh
+)
+
+include (../cmake/FindSDL2.cmake)
+
+find_package (Boost COMPONENTS system REQUIRED)
+find_package (SDL2 REQUIRED)
+
+include_directories (${SDL2_INCLUDE_DIR})
+include_directories (${Boost_INCLUDE_DIRS})
+
+install (TARGETS ObjSDL_events DESTINATION bin)

controller_event.cc renamed to events/controller_event.cc

@@ -10,7 +10,7 @@
 #include <chrono>
 #include <unordered_map>
 #include <functional>
-#include "window.hh"
+#include "../window.hh"
 
 namespace SDL {
     class Event;

controller_event.hh renamed to events/controller_event.hh

@@ -1,8 +1,8 @@
 #ifndef OBJSDL_KEYBOARD_EVENT_HH
 #define OBJSDL_KEYBOARD_EVENT_HH
 #include "event.hh"
+#include "../keys.hh"
 
-#include "keys.hh"
 
 namespace SDL {
     namespace events {

event.cc renamed to events/event.cc

@@ -1,4 +1,9 @@
+#ifndef OBJSDL_WINDOW_HH
+#define OBJSDL_WINDOW_HH
+
 namespace SDL {
     struct Window {
     };
 }
+
+#endif