diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-19 09:43:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-19 09:43:30 +0300 |
| commit | b1a53cc85b3a5a78daf0b9249cef64c26632244e (patch) | |
| tree | 4752afb39448eff350a1a5d11d7660ec92195ba7 /build_files | |
| parent | 108e6d4ef2bc62752f8071179092c0cc80b3f867 (diff) | |
| parent | 638fa188b79b182033351f0fcc65212c59f4de04 (diff) | |
Merge branch 'master' into newboolean
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/boost.cmake | 6 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/ffmpeg.cmake | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 22b5f33e690..d01c62b679c 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -56,6 +56,12 @@ if(WITH_BOOST_PYTHON) --with-python --user-config=${JAM_FILE} ) + if(WIN32 AND BUILD_MODE STREQUAL Debug) + set(BOOST_PYTHON_OPTIONS + ${BOOST_PYTHON_OPTIONS} + define=BOOST_DEBUG_PYTHON + ) + endif() endif() set(BOOST_OPTIONS diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake index 164997b9aa5..7fbd613b25d 100644 --- a/build_files/build_environment/cmake/ffmpeg.cmake +++ b/build_files/build_environment/cmake/ffmpeg.cmake @@ -95,8 +95,6 @@ ExternalProject_Add(external_ffmpeg --disable-version3 --disable-debug --enable-optimizations - --disable-sse - --disable-ssse3 --enable-ffplay --disable-openssl --disable-securetransport |