From 5b68e18df412629fe5e57f9484b995965a58e21f Mon Sep 17 00:00:00 2001 From: hiker Date: Fri, 11 Aug 2017 09:38:58 +1000 Subject: [PATCH] Fix cygwin support. --- lib/irrlicht/CMakeLists.txt | 2 +- lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt index 89de9cf10..ae2b46f41 100644 --- a/lib/irrlicht/CMakeLists.txt +++ b/lib/irrlicht/CMakeLists.txt @@ -570,5 +570,5 @@ if(ENABLE_WAYLAND_DEVICE) endif() if(WIN32) - target_link_libraries(stkirrlicht imm32 XINPUT9_1_0) + target_link_libraries(stkirrlicht imm32 xinput9_1_0) endif() diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp index 90fc86c1e..ffead1982 100644 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp @@ -25,11 +25,8 @@ // See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/ #undef _WIN32_WINNT #define _WIN32_WINNT 0x0601 -#ifdef __CYGWIN__ +// Don't change the case of xinput.h, otherwise cygwin compilation fails. #include -#else -#include -#endif #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ #define DIRECTINPUT_VERSION 0x0800 #include