forked from bartvdbraak/blender
Use dynamically linked SDL 1.2.15 on windows x64
This commit is contained in:
parent
eb016eb3ae
commit
bcbbed0ccf
@ -1101,9 +1101,6 @@ 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']:
|
||||||
if env['OURPLATFORM'] == 'win64-vc':
|
|
||||||
pass # we link statically already to SDL on win64
|
|
||||||
else:
|
|
||||||
dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
|
dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
|
||||||
|
|
||||||
if env['WITH_BF_PYTHON']:
|
if env['WITH_BF_PYTHON']:
|
||||||
|
@ -737,13 +737,11 @@ elseif(WIN32)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_SDL)
|
if(WITH_SDL)
|
||||||
if(NOT CMAKE_CL_64)
|
|
||||||
install(
|
install(
|
||||||
FILES ${LIBDIR}/sdl/lib/SDL.dll
|
FILES ${LIBDIR}/sdl/lib/SDL.dll
|
||||||
DESTINATION ${TARGETDIR}
|
DESTINATION ${TARGETDIR}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT CMAKE_CL_64)
|
if(NOT CMAKE_CL_64)
|
||||||
install(
|
install(
|
||||||
|
Loading…
Reference in New Issue
Block a user