diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
| commit | 3bca9f5fed1f6d3dd485e3cff2174c3394bb1162 (patch) | |
| tree | 7083a56f6b8db22ad51a6319f7281cb4d7124c12 /build_files/build_environment/cmake/vpx.cmake | |
| parent | 3311505fd07310a6bfac79ce787dbd394002dd1f (diff) | |
| parent | f20d7bed1426ca3d1268182835f04e7ab8212cac (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/makesrna/intern/rna_render.c
Diffstat (limited to 'build_files/build_environment/cmake/vpx.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/vpx.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/vpx.cmake b/build_files/build_environment/cmake/vpx.cmake index 6569708cb5f..9d155be1c6c 100644 --- a/build_files/build_environment/cmake/vpx.cmake +++ b/build_files/build_environment/cmake/vpx.cmake @@ -23,7 +23,11 @@ if(WIN32) set(VPX_EXTRA_FLAGS --target=x86-win32-gcc) endif() else() - set(VPX_EXTRA_FLAGS --target=generic-gnu) + if(APPLE) + set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc) + else() + set(VPX_EXTRA_FLAGS --target=generic-gnu) + endif() endif() ExternalProject_Add(external_vpx @@ -33,7 +37,7 @@ ExternalProject_Add(external_vpx PREFIX ${BUILD_DIR}/vpx CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && - ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vpx + ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx --disable-shared --enable-static --disable-install-bins |