ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cygwin support.

Browse Source
This commit is contained in:
hiker 2017-08-11 09:38:58 +10:00
parent 86d5e11c13
commit 5b68e18df4
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irrlicht/CMakeLists.txt
View File

@ -570,5 +570,5 @@ if(ENABLE_WAYLAND_DEVICE)
endif() endif()
if(WIN32) if(WIN32)
target_link_libraries(stkirrlicht imm32 XINPUT9_1_0) target_link_libraries(stkirrlicht imm32 xinput9_1_0)
endif() endif()

5
lib/irrlicht/source/Irrlicht/CIrrDeviceWin32.cpp
View File

@ -25,11 +25,8 @@
// See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/ // See https://blogs.msdn.microsoft.com/chuckw/2012/04/25/xinput-and-windows-8/
#undef _WIN32_WINNT #undef _WIN32_WINNT
#define _WIN32_WINNT 0x0601 #define _WIN32_WINNT 0x0601
#ifdef __CYGWIN__ // Don't change the case of xinput.h, otherwise cygwin compilation fails.
#include <xinput.h> #include <xinput.h>
#else
#include <Xinput.h>
#endif
#ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ #ifdef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800
#include <dinput.h> #include <dinput.h>