From 38e800f70d122051e12ac9f22e23d84b97fec424 Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Sat, 21 Jan 2017 11:53:03 +0200
Subject: InputCommon: add Keyboard

---
 src/input_common/CMakeLists.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/input_common/CMakeLists.txt

(limited to 'src/input_common/CMakeLists.txt')

diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
new file mode 100644
index 000000000..ac1ad45a9
--- /dev/null
+++ b/src/input_common/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(SRCS
+            keyboard.cpp
+            main.cpp
+            )
+
+set(HEADERS
+            keyboard.h
+            main.h
+            )
+
+create_directory_groups(${SRCS} ${HEADERS})
+
+add_library(input_common STATIC ${SRCS} ${HEADERS})
+target_link_libraries(input_common common core)
+
-- 
cgit v1.2.3


From a6bd7917cbc06f9b8f5a7ae24e75db776dc1cd6a Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Sat, 21 Jan 2017 13:04:00 +0200
Subject: InputCommon: add AnalogFromButton

---
 src/input_common/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/input_common/CMakeLists.txt')

diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index ac1ad45a9..9f4422269 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -1,9 +1,11 @@
 set(SRCS
+            analog_from_button.cpp
             keyboard.cpp
             main.cpp
             )
 
 set(HEADERS
+            analog_from_button.h
             keyboard.h
             main.h
             )
-- 
cgit v1.2.3


From 51b1c1f211bf8112eba845256bd52cbd36a5932a Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Sat, 21 Jan 2017 17:33:48 +0200
Subject: InputCommon: add SDL joystick support

---
 src/input_common/CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/input_common/CMakeLists.txt')

diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index 9f4422269..cfe5caaa3 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -10,8 +10,18 @@ set(HEADERS
             main.h
             )
 
+if(SDL2_FOUND)
+    set(SRCS ${SRCS} sdl/sdl.cpp)
+    set(HEADERS ${HEADERS} sdl/sdl.h)
+    include_directories(${SDL2_INCLUDE_DIR})
+endif()
+
 create_directory_groups(${SRCS} ${HEADERS})
 
 add_library(input_common STATIC ${SRCS} ${HEADERS})
 target_link_libraries(input_common common core)
 
+if(SDL2_FOUND)
+    target_link_libraries(input_common ${SDL2_LIBRARY})
+    set_property(TARGET input_common APPEND PROPERTY COMPILE_DEFINITIONS HAVE_SDL2)
+endif()
-- 
cgit v1.2.3