diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2017-09-18 19:54:37 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2017-09-18 19:54:37 +0300 |
| commit | d486b17088c75a0ade22afff39c27dd0ae22520e (patch) | |
| tree | ab64af885b51a3cc730268495b8a7abd6875cd51 /build_files | |
| parent | d0344d7b7d619e62bc852c4d00df52cfbfdda544 (diff) | |
[cmake/dependencies] Update libsndfile to 1.0.28
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/sndfile.cmake | 6 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake index 13368c05fbe..38ba3043c98 100644 --- a/build_files/build_environment/cmake/sndfile.cmake +++ b/build_files/build_environment/cmake/sndfile.cmake @@ -21,6 +21,10 @@ set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR if(WIN32) 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 @@ -28,7 +32,7 @@ ExternalProject_Add(external_sndfile DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${SNDFILE_HASH} PREFIX ${BUILD_DIR}/sndfile - CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_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 f9f9fdcface..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(SNDFILE_VERSION 1.0.26) +set(SNDFILE_VERSION 1.0.28) set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz) -set(SNDFILE_HASH ec810a0c60c08772a8a5552704b63393) +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) |