diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2014-11-13 18:19:57 +0300 |
---|---|---|
committer | Martijn Berger <martijn.berger@gmail.com> | 2014-11-13 18:23:27 +0300 |
commit | 96ca64629d3373293b083540e593f500cb9a4e7d (patch) | |
tree | dfdb976380b76bfd06017246565241ab65c0bfb4 /source | |
parent | dc519f3eb76468f0a580c0df7a82676568c47a6a (diff) |
Windows (MSVC2013) move to SDL2
Diffstat (limited to 'source')
-rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 181571bda77..4cbfe9a7e00 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -747,7 +747,7 @@ elseif(WIN32) if(WITH_SDL) install( - FILES ${LIBDIR}/sdl/lib/SDL.dll + FILES ${LIBDIR}/sdl/lib/SDL2.dll DESTINATION "." ) endif() diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp index 2911b3b1a14..38baeaab35e 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp @@ -36,6 +36,9 @@ #include "SCA_Joystick.h" #include "SCA_JoystickPrivate.h" +#ifdef _MSC_VER +# include <cstdio> /* printf */ +#endif #ifdef WITH_SDL void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event) |