From 3b2c5b57f9e22e4293de42e519ee7d5b3ef1bd61 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Sun, 20 Dec 2020 20:00:36 +1100 Subject: [PATCH 3/5] OIS include path - case sensitive on linux --- CMake/Modules/FindOIS.cmake | 6 ++++-- src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMake/Modules/FindOIS.cmake b/CMake/Modules/FindOIS.cmake index 8c4ef17..e98af3f 100644 --- a/CMake/Modules/FindOIS.cmake +++ b/CMake/Modules/FindOIS.cmake @@ -4,7 +4,7 @@ # OIS_INCLUDE_DIR, where to find headers -FIND_PATH(OIS_INCLUDE_DIR OIS/OIS.h +FIND_PATH(OIS_INCLUDE_DIR ois/OIS.h PATHS $ENV{OGRE_DEPENDENCIES_DIR} PATH_SUFFIXES @@ -15,16 +15,18 @@ FIND_LIBRARY(OIS_LIBRARY_R NAMES OIS PATHS $ENV{OGRE_DEPENDENCIES_DIR}/lib/Release + $ENV{OGRE_DEPENDENCIES_DIR}/lib ) FIND_LIBRARY(OIS_LIBRARY_D NAMES OISd OIS PATHS $ENV{OGRE_DEPENDENCIES_DIR}/lib/Debug + $ENV{OGRE_DEPENDENCIES_DIR}/lib ) SET(OIS_LIBRARIES optimized ${OIS_LIBRARY_R} debug ${OIS_LIBRARY_D}) IF(OIS_LIBRARY AND OIS_INCLUDE_DIR) SET(OIS_FOUND "YES") -ENDIF() \ No newline at end of file +ENDIF() diff --git a/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp b/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp index 9e666ae..37644d3 100644 --- a/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp +++ b/src/Skybolt/SkyboltEngine/Input/InputPlatformOis.cpp @@ -6,11 +6,11 @@ #include "InputPlatformOis.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -- 2.29.2