Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Windows (MSVC2013) move to SDL2

Browse Source
This commit is contained in:
Martijn Berger
2014-11-13 16:19:57 +01:00
parent dc519f3eb7
commit 96ca64629d
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1675,7 +1675,7 @@ elseif(WIN32)
if(WITH_SDL) if(WITH_SDL)
set(SDL ${LIBDIR}/sdl) set(SDL ${LIBDIR}/sdl)
set(SDL_INCLUDE_DIR ${SDL}/include) set(SDL_INCLUDE_DIR ${SDL}/include)
set(SDL_LIBRARY SDL) set(SDL_LIBRARY SDL2)
set(SDL_LIBPATH ${SDL}/lib) set(SDL_LIBPATH ${SDL}/lib)
endif() endif()

2
SConstruct
View File

@@ -1180,7 +1180,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll'] dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
if env['WITH_BF_SDL']: 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['WITH_BF_PYTHON']:
if env['BF_DEBUG']: if env['BF_DEBUG']:

2
build_files/scons/config/win32-vc-config.py
View File

@@ -57,7 +57,7 @@ BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
WITH_BF_SDL = True WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include' BF_SDL_INC = '${BF_SDL}/include'
BF_SDL_LIB = 'SDL.lib' BF_SDL_LIB = 'SDL2.lib'
BF_SDL_LIBPATH = '${BF_SDL}/lib' BF_SDL_LIBPATH = '${BF_SDL}/lib'
BF_PTHREADS = LIBDIR + '/pthreads' BF_PTHREADS = LIBDIR + '/pthreads'

2
build_files/scons/config/win64-vc-config.py
View File

@@ -52,7 +52,7 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
WITH_BF_SDL = True WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' BF_SDL = LIBDIR + '/sdl'
BF_SDL_INC = '${BF_SDL}/include' BF_SDL_INC = '${BF_SDL}/include'
BF_SDL_LIB = 'SDL.lib' BF_SDL_LIB = 'SDL2.lib'
BF_SDL_LIBPATH = '${BF_SDL}/lib' BF_SDL_LIBPATH = '${BF_SDL}/lib'
WITH_BF_JACK = False WITH_BF_JACK = False

2
source/creator/CMakeLists.txt
View File

@@ -747,7 +747,7 @@ elseif(WIN32)
if(WITH_SDL) if(WITH_SDL)
install( install(
FILES ${LIBDIR}/sdl/lib/SDL.dll FILES ${LIBDIR}/sdl/lib/SDL2.dll
DESTINATION "." DESTINATION "."
) )
endif() endif()

3
source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
View File

@@ -36,6 +36,9 @@
#include "SCA_Joystick.h" #include "SCA_Joystick.h"
#include "SCA_JoystickPrivate.h" #include "SCA_JoystickPrivate.h"
#ifdef _MSC_VER
# include <cstdio> /* printf */
#endif
#ifdef WITH_SDL #ifdef WITH_SDL
void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event) void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event)