diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-14 04:19:42 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-14 04:19:42 +0300 |
| commit | 1f3eb3088ffcb1ff26c903ba0a6bd978799a7510 (patch) | |
| tree | 3d9ebcf73bc305bc664c007c89561936c9df96df /build_files/build_environment/cmake | |
| parent | fee32abee977c3d44c0ea7d098441d6261f51d3d (diff) | |
build_environment: sdl 2.0.8
Diffstat (limited to 'build_files/build_environment/cmake')
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 4 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/sdl.cmake | 10 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index f346429dfbf..6ad9a10667f 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -34,10 +34,6 @@ if(BUILD_MODE STREQUAL Release) # pthreads, rename include dir ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib && - # sdl merge bin/lib folder, copy include - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib && # OpenImageIO ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib && diff --git a/build_files/build_environment/cmake/sdl.cmake b/build_files/build_environment/cmake/sdl.cmake index 0fbfa078eb1..4e32245f81f 100644 --- a/build_files/build_environment/cmake/sdl.cmake +++ b/build_files/build_environment/cmake/sdl.cmake @@ -37,3 +37,13 @@ ExternalProject_Add(external_sdl CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/sdl ) + +if(BUILD_MODE STREQUAL Release AND WIN32) + ExternalProject_Add_Step(external_sdl after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib + DEPENDEES install + ) +endif() + diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index e0af29ce0a7..d2e39351b7e 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -97,9 +97,9 @@ set(OPENSUBDIV_VERSION v3_3_3) set(OPENSUBDIV_Hash 29c79dc01ef616aab02670bed5544ddd) set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz) -set(SDL_VERSION 2.0.4) +set(SDL_VERSION 2.0.8) set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz) -set(SDL_HASH 44fc4a023349933e7f5d7a582f7b886e) +set(SDL_HASH 3800d705cef742c6a634f202c37f263f) set(OPENCOLLADA_VERSION v1.6.51) set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz) |