diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
commit | af170839afc6334bb3ce9ea62624c6c103707dc6 (patch) | |
tree | f3536c500ad8982ce9d49dcd8014ce37904575a3 /build_files | |
parent | 2cdc2f2a2542f31c1c11a9913830f0ff7846888a (diff) | |
parent | b31faac17eaf66e034107f136bb00dd16361a0bf (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/cmake/sndfile.cmake | 16 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 6 |
2 files changed, 13 insertions, 9 deletions
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake index fb8d0d98e0e..38ba3043c98 100644 --- a/build_files/build_environment/cmake/sndfile.cmake +++ b/build_files/build_environment/cmake/sndfile.cmake @@ -16,19 +16,23 @@ # # ***** END GPL LICENSE BLOCK ***** -set(LIBSNDFILE_EXTRA_ARGS) -set(LIBSNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}) +set(SNDFILE_EXTRA_ARGS) +set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR}) if(WIN32) - set(LIBSNDFILE_ENV set ${LIBSNDFILE_ENV} &&) + set(SNDFILE_ENV set ${SNDFILE_ENV} &&) + #shared for windows because static libs will drag in a libgcc dependency. + set(SNDFILE_OPTIONS --disable-static --enable-shared ) +else() + set(SNDFILE_OPTIONS --enable-static --disable-shared ) endif() ExternalProject_Add(external_sndfile - URL ${LIBSNDFILE_URI} + URL ${SNDFILE_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH MD5=${LIBSNDFILE_HASH} + URL_HASH MD5=${SNDFILE_HASH} PREFIX ${BUILD_DIR}/sndfile - CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${LIBSNDFILE_ENV} ${CONFIGURE_COMMAND} --enable-static --disable-shared --prefix=${mingw_LIBDIR}/sndfile + CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS} INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install INSTALL_DIR ${LIBDIR}/sndfile diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index fe60e04ee43..5b5af6cfec1 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -216,9 +216,9 @@ set(LAPACK_VERSION 3.6.0) set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz) set(LAPACK_HASH f2f6c67134e851fe189bb3ca1fbb5101) -set(LIBSNDFILE_VERSION 1.0.26) -set(LIBSNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${LIBSNDFILE_VERSION}.tar.gz) -set(LIBSNDFILE_HASH ec810a0c60c08772a8a5552704b63393) +set(SNDFILE_VERSION 1.0.28) +set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz) +set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c) #set(HIDAPI_VERSION 0.8.0-rc1) #set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz) |