Windows (MSVC2013) move to SDL2
This commit is contained in:
parent
dc519f3eb7
commit
96ca64629d
@ -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()
|
||||
|
||||
|
@ -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']:
|
||||
|
@ -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'
|
||||
|
@ -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
|
||||
|
@ -747,7 +747,7 @@ elseif(WIN32)
|
||||
|
||||
if(WITH_SDL)
|
||||
install(
|
||||
FILES ${LIBDIR}/sdl/lib/SDL.dll
|
||||
FILES ${LIBDIR}/sdl/lib/SDL2.dll
|
||||
DESTINATION "."
|
||||
)
|
||||
endif()
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user