Fix CMake build

Update SDL dependency

CMakeLists.txt

@@ -9,16 +9,19 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 
 # Libraries
-# FIXME
-set(SDL2_LIBRARY /opt/SDL2/lib/libSDL2.so)
+list(APPEND CMAKE_MODULE_PATH "/usr/lib/x86_64-linux-gnu/cmake")
+find_package(SDL2 REQUIRED)
+include_directories(${SDL2_INCLUDE_DIRS})
 set(SDL2_IMAGE_LIBRARIES /opt/SDL2/lib/libSDL2_image.so)
 set(SDL2_MIXER_LIBRARIES /opt/SDL2/lib/libSDL2_mixer.so)
-set(BOX2D_LIBRARY /usr/lib/x86_64-linux-gnu/libBox2D.so.2.3.0)
-
-#find_package(SDL2 REQUIRED)
+# FIXME
 #find_package(SDL2_Image REQUIRED)
 #find_package(SDL2_ttf REQUIRED)
+set(BOX2D_LIBRARY /usr/lib/x86_64-linux-gnu/libBox2D.so.2.3.0)
+
 find_package(GLEW REQUIRED)
+# Set OpenGL preference
+cmake_policy(SET CMP0072 NEW)
 find_package(OpenGL REQUIRED)
 find_package(X11 REQUIRED)
 find_package(Threads REQUIRED)

examples/collision/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(collision stdafx.cpp collisionapp.cpp)
-target_link_libraries(collision dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
+target_link_libraries(collision dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/flocking/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(flocking stdafx.cpp flockingapp.cpp boid.cpp)
-target_link_libraries(flocking dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
+target_link_libraries(flocking dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/framebuffer/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(framebuffer stdafx.cpp framebufferapp.cpp fractalscene.cpp ripplepondscene.cpp titlescene.cpp)
-target_link_libraries(framebuffer dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(framebuffer dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/fullscreenfx/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(fullscreenfx stdafx.cpp fullscreenfxapp.cpp)
-target_link_libraries(fullscreenfx dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(fullscreenfx dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/grid/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(grid stdafx.cpp gridapp.cpp)
-target_link_libraries(grid dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
+target_link_libraries(grid dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/heatmap/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(heatmap stdafx.cpp heatmapapp.cpp heatmap.cpp)
-target_link_libraries(heatmap dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
+target_link_libraries(heatmap dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/hello/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(hello stdafx.cpp hellodukat.cpp)
-target_link_libraries(hello dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(hello dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/input/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(input stdafx.cpp inputapp.cpp)
-target_link_libraries(input dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(input dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/input/inputapp.cpp

@@ -221,7 +221,7 @@ namespace dukat
 			FeedbackKey{ 1.6f, 0.0f, 0.0f },
 		};
 		auto seq = std::make_unique<FeedbackSequence>(10.0f, keys);
-		feedback = game->get_devices()->start_feedback(std::move(seq));
+		feedback = game->get_devices()->start_feedback(seq);
 	}
 
 	void InputScene::feedback_hi_lo(void)
@@ -240,7 +240,7 @@ namespace dukat
 			FeedbackKey{ 2.5f, 0.0f, 0.0f },
 		};
 		auto seq = std::make_unique<FeedbackSequence>(10.0f, keys);
-		feedback = game->get_devices()->start_feedback(std::move(seq));
+		feedback = game->get_devices()->start_feedback(seq);
 	}
 
 	void InputScene::update_info_text(void)

examples/layers/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(layers stdafx.cpp layersapp.cpp)
-target_link_libraries(layers dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(layers dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/lighting/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(lighting stdafx.cpp lightingapp.cpp)
-target_link_libraries(lighting dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
+target_link_libraries(lighting dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/lighting2d/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(lighting2d stdafx.cpp lighting2dapp.cpp)
-target_link_libraries(lighting2d dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(lighting2d dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/mapgen/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(mapgen stdafx.cpp mapgenapp.cpp)
-target_link_libraries(mapgen dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(mapgen dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/modelviewer/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(modelviewer stdafx.cpp modelviewer.cpp)
-target_link_libraries(modelviewer dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
+target_link_libraries(modelviewer dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/octree/CMakeLists.txt

@@ -18,6 +18,6 @@ endif(NOISE_ENABLED)
 add_executable(octree ${SRC_LIST})
 
 target_link_libraries(octree dukat 
-    ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} 
+    ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} 
     ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT} ${NOISE_LIBRARY}
     )

examples/particles/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(particles stdafx.cpp particles.cpp)
-target_link_libraries(particles dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(particles dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/room/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(room stdafx.cpp roomapp.cpp roomcamera.cpp)
-target_link_libraries(room dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(room dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/scenes/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(scenes stdafx.cpp scenes.cpp gamescene.cpp titlescene.cpp dialogscene.cpp)
-target_link_libraries(scenes dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
+target_link_libraries(scenes dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/scrolling/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(scrolling stdafx.cpp scrollingapp.cpp)
-target_link_libraries(scrolling dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(scrolling dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/skydome/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(skydome stdafx.cpp skydomeapp.cpp)
-target_link_libraries(skydome dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(skydome dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/sprites/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(sprites stdafx.cpp spritesapp.cpp)
-target_link_libraries(sprites dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
+target_link_libraries(sprites dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/surface/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(surface stdafx.cpp surfaceapp.cpp)
-target_link_libraries(surface dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(surface dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/terrain/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(terrain stdafx.cpp terrainapp.cpp)
-target_link_libraries(terrain dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
+target_link_libraries(terrain dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} ${PNG_LIBRARY}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/text/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(text stdafx.cpp text.cpp)
-target_link_libraries(text dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
+target_link_libraries(text dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES} 
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

examples/waves/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(../../include)
 
 add_executable(waves stdafx.cpp wavesapp.cpp)
-target_link_libraries(waves dukat ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
+target_link_libraries(waves dukat ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_MIXER_LIBRARIES}
     ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES} ${X11_Xext_LIB} ${CMAKE_THREAD_LIBS_INIT})

include/dukat/feedback.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <vector>
 
 namespace dukat
@@ -29,7 +30,7 @@ namespace dukat
 		int cur_key; // index of current key
 		int next_key; // index of next key
 
-		struct FeedbackSequence(float duration, const std::vector<FeedbackKey>& keys)
+		FeedbackSequence(float duration, const std::vector<FeedbackKey>& keys)
 			: duration(duration), keys(keys), runtime(0.0f), index(0.0f), cur_key(0), next_key(1)
 		{
 		}

src/CMakeLists.txt

@@ -10,7 +10,7 @@ if(ANDROID)
 		camera2.cpp camera3.cpp collisionmanager2.cpp
 		debugeffect2.cpp devicemanager.cpp
 		effectpass.cpp environment.cpp eulerangles.cpp
-		firstpersoncamera3.cpp fixedcamera3.cpp fontcache.cpp fullscreeneffect2.cpp 
+		feedback.cpp firstpersoncamera3.cpp fixedcamera3.cpp fontcache.cpp fullscreeneffect2.cpp 
 		game2.cpp game3.cpp gamebase.cpp gamepaddevice.cpp geometry.cpp
 		inputdevice.cpp inputrecorder.cpp json.cpp keyboarddevice.cpp log.cpp mathutil.cpp matrix2.cpp matrix4.cpp meshbuilder2.cpp meshbuilder3.cpp
 		meshcache.cpp meshdata.cpp meshgroup.cpp meshinstance.cpp messenger.cpp model3.cpp obb2.cpp orbitcamera3.cpp 

src/gamepaddevice.cpp

@@ -46,8 +46,10 @@ namespace dukat
 		char buffer[33];
 		SDL_JoystickGetGUIDString(guid, buffer, 33);
 		log->debug("Device GUID: {}", buffer);
+#if SDL_VERSION_ATLEAST(2, 0, 18)
 		log->debug("Rumble support: {}", SDL_GameControllerHasRumble(device));
 		log->debug("Rumble triggers support: {}", SDL_GameControllerHasRumbleTriggers(device));
+#endif
 	}
 
 	GamepadDevice::~GamepadDevice(void)