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 | |
| parent | dc519f3eb76468f0a580c0df7a82676568c47a6a (diff) | |
Windows (MSVC2013) move to SDL2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | 3 |
6 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 25182ef6e88..6fe89022342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1675,7 +1675,7 @@ elseif(WIN32) if(WITH_SDL) set(SDL ${LIBDIR}/sdl) set(SDL_INCLUDE_DIR ${SDL}/include) - set(SDL_LIBRARY SDL) + set(SDL_LIBRARY SDL2) set(SDL_LIBPATH ${SDL}/lib) endif() diff --git a/SConstruct b/SConstruct index 37c8fa42f10..599ea9b312f 100644 --- a/SConstruct +++ b/SConstruct @@ -1180,7 +1180,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll'] if env['WITH_BF_SDL']: - dllsources.append('${BF_SDL_LIBPATH}/SDL.dll') + dllsources.append('${BF_SDL_LIBPATH}/SDL2.dll') if env['WITH_BF_PYTHON']: if env['BF_DEBUG']: diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 6dd853b7da4..48a40cf6719 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -57,7 +57,7 @@ BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib' WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' -BF_SDL_LIB = 'SDL.lib' +BF_SDL_LIB = 'SDL2.lib' BF_SDL_LIBPATH = '${BF_SDL}/lib' BF_PTHREADS = LIBDIR + '/pthreads' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index f928f166ba7..285e9ac9867 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -52,7 +52,7 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib' WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' -BF_SDL_LIB = 'SDL.lib' +BF_SDL_LIB = 'SDL2.lib' BF_SDL_LIBPATH = '${BF_SDL}/lib' WITH_BF_JACK = False 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) |