[Bf-blender-cvs] [560dd93] master: Don't change global compiler flags when FFmpeg is enabled
Sergey Sharybin
noreply at git.blender.org
Mon Oct 20 23:22:19 CEST 2014
Commit: 560dd932c2a84d7d1a4b93554faa7bc66dfdb649
Author: Sergey Sharybin
Date: Tue Oct 21 03:21:09 2014 +0600
Branches: master
https://developer.blender.org/rB560dd932c2a84d7d1a4b93554faa7bc66dfdb649
Don't change global compiler flags when FFmpeg is enabled
It should no be longer needed. If it causes the issues please let me know
to find a more cleaner solution.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91a8a04..497abb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -789,7 +789,6 @@ if(UNIX AND NOT APPLE)
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
endif()
if(WITH_FFTW3)
@@ -1801,7 +1800,6 @@ elseif(APPLE)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
endif()
find_library(SYSTEMSTUBS_LIBRARY
More information about the Bf-blender-cvs
mailing list