diff options
21 files changed, 163 insertions, 99 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ecba5caf44c..826288e5fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,25 +87,26 @@ OPTION(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON) # Image format support OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) -OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) +OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON) OPTION(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON) OPTION(WITH_IMAGE_DDS "Enable DDS Image Support" ON) OPTION(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON) OPTION(WITH_IMAGE_HDR "Enable HDR Image Support" ON) +OPTION(WITH_IMAGE_REDCODE "Enable RedCode Image Support" ON) -# Audio format support -OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) -OPTION(WITH_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF) +# Audio/Video format support +OPTION(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF) +OPTION(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF) IF(APPLE OR (WIN32 AND NOT UNIX)) - OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF) + OPTION(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF) ENDIF(APPLE OR (WIN32 AND NOT UNIX)) # 3D format support # disable opencollada on non-apple unix because opencollada has no package for debian IF(UNIX AND NOT APPLE) - OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF) + OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF) ELSE() - OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF) + OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF) ENDIF() # Sound output @@ -134,17 +135,21 @@ ENDIF(APPLE) # OPTION(WITH_LCMS "Enable color correction with lcms" OFF) IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) - MESSAGE(FATAL_ERROR "WITH_PLAYER needs WITH_GAMEENGINE") + MESSAGE(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE") ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER) IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL) - MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL") + MESSAGE("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL") ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL) IF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK)) - MESSAGE(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK need WITH_SAMPLERATE") + MESSAGE(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE") ENDIF(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK)) +IF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE) + MESSAGE(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG") +ENDIF(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE) + TEST_SSE_SUPPORT() # disabled for now, not supported @@ -177,12 +182,12 @@ IF(UNIX AND NOT APPLE) SET(JACK_LIBPATH ${JACK}/lib) ENDIF(WITH_JACK) - IF(WITH_SNDFILE) - SET(SNDFILE /usr) - SET(SNDFILE_INC ${SNDFILE}/include) - SET(SNDFILE_LIB sndfile) - SET(SNDFILE_LIBPATH ${SNDFILE}/lib) - ENDIF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) + SET(SNDFILE /usr) + SET(SNDFILE_INC ${SNDFILE}/include) + SET(SNDFILE_LIB sndfile) + SET(SNDFILE_LIBPATH ${SNDFILE}/lib) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_INTERNATIONAL) FIND_LIBRARY(INTL_LIBRARY @@ -269,13 +274,13 @@ IF(UNIX AND NOT APPLE) SET(LCMS_LIBPATH ${LCMS}/lib) ENDIF(WITH_LCMS) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory") SET(FFMPEG_INC ${FFMPEG}/include) SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries") SET(FFMPEG_LIBPATH ${FFMPEG}/lib) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS") - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_FFTW3) SET(FFTW3 /usr) @@ -406,12 +411,12 @@ ELSEIF(WIN32) SET(OPENAL_LIBPATH ${OPENAL}/lib) ENDIF(WITH_OPENAL) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) SET(SNDFILE ${LIBDIR}/sndfile) SET(SNDFILE_INC ${SNDFILE}/include) SET(SNDFILE_LIB libsndfile-1) SET(SNDFILE_LIBPATH ${SNDFILE}/lib) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SDL) SET(SDL ${LIBDIR}/sdl) @@ -420,12 +425,12 @@ ELSEIF(WIN32) SET(SDL_LIBPATH ${SDL}/lib) ENDIF(WITH_SDL) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) SET(QUICKTIME ${LIBDIR}/QTDevWin) SET(QUICKTIME_INC ${QUICKTIME}/CIncludes) SET(QUICKTIME_LIB qtmlClient) SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) ADD_DEFINITIONS(-D__SSE__ -D__MMX__) @@ -517,12 +522,12 @@ ELSEIF(WIN32) SET(LCMS_LIB lcms) ENDIF(WITH_LCMS) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) SET(FFMPEG ${LIBDIR}/ffmpeg) SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc) SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/openexr) @@ -629,12 +634,12 @@ ELSEIF(WIN32) SET(PCRE_LIB pcre) ENDIF(WITH_OPENCOLLADA) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) SET(FFMPEG ${LIBDIR}/ffmpeg) SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include) SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/gcc/openexr) @@ -707,12 +712,12 @@ ELSEIF(APPLE) SET(JACK_LIBPATH ${JACK}/lib) ENDIF(WITH_JACK) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) SET(SNDFILE ${LIBDIR}/sndfile) SET(SNDFILE_INC ${SNDFILE}/include) SET(SNDFILE_LIB sndfile FLAC ogg vorbis vorbisenc) SET(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) SET(PYTHON_VERSION 3.1) @@ -777,13 +782,13 @@ ELSEIF(APPLE) SET(LCMS_LIBPATH ${LCMS}/lib) ENDIF(WITH_LCMS) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) SET(FFMPEG ${LIBDIR}/ffmpeg) SET(FFMPEG_INC ${FFMPEG}/include) SET(FFMPEG_LIB 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(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_SAMPLERATE) SET(LIBSAMPLERATE ${LIBDIR}/samplerate) @@ -804,7 +809,7 @@ ELSEIF(APPLE) SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") #libSDL still needs 32bit carbon quicktime ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386) - ELSEIF(WITH_QUICKTIME) + ELSEIF(WITH_CODEC_QUICKTIME) SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime") ENDIF(USE_QTKIT) ELSE (WITH_COCOA) @@ -914,9 +919,13 @@ ENDIF(WITH_RAYOPTIMIZATION) IF(WITH_IMAGE_OPENJPEG) set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG_INC ${OPENJPEG}) - set(OPENJPEG_LIb extern_openjpeg) ENDIF(WITH_IMAGE_OPENJPEG) +IF(WITH_IMAGE_REDCODE) + set(REDCODE ${CMAKE_SOURCE_DIR}/extern) + set(REDCODE_INC ${REDCODE}) +ENDIF(WITH_IMAGE_REDCODE) + #----------------------------------------------------------------------------- # Blender WebPlugin diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c35c73cbb46..8fbef8a0784 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -63,9 +63,9 @@ MACRO(SETUP_LIBDIRS) IF(WITH_SDL) LINK_DIRECTORIES(${SDL_LIBPATH}) ENDIF(WITH_SDL) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) LINK_DIRECTORIES(${FFMPEG_LIBPATH}) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_IMAGE_OPENEXR) LINK_DIRECTORIES(${OPENEXR_LIBPATH}) ENDIF(WITH_IMAGE_OPENEXR) @@ -75,18 +75,18 @@ MACRO(SETUP_LIBDIRS) IF(WITH_LCMS) LINK_DIRECTORIES(${LCMS_LIBPATH}) ENDIF(WITH_LCMS) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) LINK_DIRECTORIES(${QUICKTIME_LIBPATH}) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_OPENAL) LINK_DIRECTORIES(${OPENAL_LIBPATH}) ENDIF(WITH_OPENAL) IF(WITH_JACK) LINK_DIRECTORIES(${JACK_LIBPATH}) ENDIF(WITH_JACK) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) LINK_DIRECTORIES(${SNDFILE_LIBPATH}) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SAMPLERATE) LINK_DIRECTORIES(${LIBSAMPLERATE_LIBPATH}) ENDIF(WITH_SAMPLERATE) @@ -142,18 +142,18 @@ MACRO(SETUP_LIBLINKS IF(WITH_JACK) TARGET_LINK_LIBRARIES(${target} ${JACK_LIB}) ENDIF(WITH_JACK) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB}) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SAMPLERATE) TARGET_LINK_LIBRARIES(${target} ${LIBSAMPLERATE_LIB}) ENDIF(WITH_SAMPLERATE) IF(WITH_SDL) TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY}) ENDIF(WITH_SDL) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_IMAGE_TIFF) TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) ENDIF(WITH_IMAGE_TIFF) @@ -170,9 +170,9 @@ MACRO(SETUP_LIBLINKS IF(WITH_LCMS) TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) ENDIF(WITH_LCMS) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB}) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) IF(WITH_OPENCOLLADA) IF(WIN32 AND NOT UNIX) FOREACH(loop_var ${OPENCOLLADA_LIB}) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 1dc610cc1b4..72a290d4e10 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -41,6 +41,10 @@ IF(WITH_IMAGE_OPENJPEG) ADD_SUBDIRECTORY(libopenjpeg) ENDIF(WITH_IMAGE_OPENJPEG) +IF(WITH_IMAGE_REDCODE) + ADD_SUBDIRECTORY(libredcode) +ENDIF(WITH_IMAGE_REDCODE) + IF(WITH_LZO) ADD_SUBDIRECTORY(lzo) ENDIF(WITH_LZO) diff --git a/extern/libredcode/CMakeLists.txt b/extern/libredcode/CMakeLists.txt new file mode 100644 index 00000000000..4805ce1b8c7 --- /dev/null +++ b/extern/libredcode/CMakeLists.txt @@ -0,0 +1,42 @@ +# $Id: +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Jacques Beaurain. +# +# ***** END GPL LICENSE BLOCK ***** + +SET(INC + . + ../libopenjpeg +) + +SET(SRC + codec.c + debayer.c + format.c + + codec.h + debayer.h + format.h +) + +BLENDERLIB(extern_redcode "${SRC}" "${INC}") diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index a9f5030cd86..440233eacbc 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -153,7 +153,7 @@ SET(SRC FX/AUD_VolumeFactory.h ) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) LIST(APPEND INC ffmpeg ${FFMPEG_INC}) SET(FFMPEGSRC @@ -163,7 +163,7 @@ IF(WITH_FFMPEG) ffmpeg/AUD_FFMPEGFactory.h ffmpeg/AUD_FFMPEGReader.h ) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_SDL) ADD_DEFINITIONS(-DWITH_SDL) @@ -195,7 +195,7 @@ IF(WITH_JACK) ) ENDIF(WITH_JACK) -IF(WITH_SNDFILE) +IF(WITH_CODEC_SNDFILE) ADD_DEFINITIONS(-DWITH_SNDFILE) LIST(APPEND INC sndfile ${SNDFILE_INC}) SET(SNDFILESRC @@ -205,7 +205,7 @@ IF(WITH_SNDFILE) sndfile/AUD_SndFileFactory.h sndfile/AUD_SndFileReader.h ) -ENDIF(WITH_SNDFILE) +ENDIF(WITH_CODEC_SNDFILE) IF(WITH_SAMPLERATE) ADD_DEFINITIONS(-DWITH_SAMPLERATE) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index a93f5e1a362..fa0a3eea393 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -105,9 +105,9 @@ IF(APPLE) ) ENDIF(WITH_COCOA) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) ELSEIF(UNIX) LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 7f4ed753956..470f395353c 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -54,9 +54,9 @@ IF(WITH_IMAGE_CINEON) ADD_SUBDIRECTORY(imbuf/intern/cineon) ENDIF(WITH_IMAGE_CINEON) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) ADD_SUBDIRECTORY(quicktime) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_PYTHON) ADD_SUBDIRECTORY(python) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 5ab4dbf0ba5..583f0327e07 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -256,15 +256,15 @@ IF(WITH_IMAGE_HDR) ADD_DEFINITIONS(-DWITH_HDR) ENDIF(WITH_IMAGE_HDR) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_LCMS) LIST(APPEND INC ${LCMS_INCLUDE_DIR}) diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index d9b15cf8ec1..0e2e8526747 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -44,9 +44,9 @@ SET(SRC util.h ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) BLENDERLIB(bf_blenpluginapi "${SRC}" "${INC}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index eed0b0d435b..670fa55d998 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -45,10 +45,10 @@ SET(SRC render_intern.h ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 141833f70e1..e68b2d20fa3 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -101,24 +101,32 @@ IF(WITH_IMAGE_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_IMAGE_TIFF) - SET(INC ${INC} ${TIFF_INCLUDE_DIR}) + LIST(APPEND INC ${TIFF_INCLUDE_DIR}) ADD_DEFINITIONS(-DWITH_TIFF) ENDIF(WITH_IMAGE_TIFF) IF(WITH_IMAGE_OPENJPEG) - SET(INC ${INC} ${OPENJPEG_INC}) + LIST(APPEND INC ${OPENJPEG_INC}) ADD_DEFINITIONS(-DWITH_OPENJPEG) ENDIF(WITH_IMAGE_OPENJPEG) -IF(WITH_QUICKTIME) - SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) +IF(WITH_IMAGE_REDCODE) + LIST(APPEND INC ${REDCODE_INC}) + ADD_DEFINITIONS(-DWITH_REDCODE) +ENDIF(WITH_IMAGE_REDCODE) + +IF(WITH_CODEC_QUICKTIME) + LIST(APPEND INC + ../quicktime + ${QUICKTIME_INC} + ) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) - SET(INC ${INC} ${FFMPEG_INC}) +IF(WITH_CODEC_FFMPEG) + LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_IMAGE_DDS) ADD_DEFINITIONS(-DWITH_DDS) diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 0365b712f24..b4dd491452e 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -319,7 +319,7 @@ static int isffmpeg (const char *filename) { #endif #ifdef WITH_REDCODE -static int isredcode(char * filename) +static int isredcode(const char * filename) { struct redcode_handle * h = redcode_open(filename); if (!h) { diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index a464e9124b7..bf9ba2dcc70 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -100,15 +100,15 @@ IF(WITH_IMAGE_HDR) ADD_DEFINITIONS(-DWITH_HDR) ENDIF(WITH_IMAGE_HDR) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../../quicktime) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_LCMS) LIST(APPEND INC ${LCMS_INCLUDE_DIR}) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index cf1d163a21c..fd3621a4cf8 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -115,10 +115,10 @@ IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(APPLE) IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 77c055e9c08..b6920a02bfa 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -85,15 +85,15 @@ IF(WITH_OPENCOLLADA) ADD_DEFINITIONS(-DWITH_COLLADA) ENDIF(WITH_OPENCOLLADA) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) LIST(APPEND INC ${FFMPEG_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_PYTHON) LIST(APPEND INC ../python ${PYTHON_INC}) diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index d1aee8c9d16..f2b7b72ac9a 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -28,9 +28,9 @@ MESSAGE(STATUS "Configuring blenderplayer") SETUP_LIBDIRS() -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ADD_DEFINITIONS(-DWITH_BINRELOC) @@ -119,9 +119,9 @@ IF(UNIX) bf_blenkernel # duplicate for linking ) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_CXX_GUARDEDALLOC) SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9f3106153ee..9a94b49c5c2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -42,9 +42,9 @@ INCLUDE_DIRECTORIES( ../blender/windowmanager ) -IF(WITH_QUICKTIME) +IF(WITH_CODEC_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +ENDIF(WITH_CODEC_QUICKTIME) IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) @@ -361,7 +361,7 @@ IF(WITH_INSTALL) ENDIF(CMAKE_CL_64) ENDIF(WITH_INTERNATIONAL) - IF(WITH_FFMPEG) + IF(WITH_CODEC_FFMPEG) ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD MAIN_DEPENDENCY blender @@ -371,15 +371,15 @@ IF(WITH_INSTALL) COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\avutil-50.dll\" \"${TARGETDIR}\\\" COMMAND copy /Y \"${LIBDIR}\\ffmpeg\\lib\\swscale-0.dll\" \"${TARGETDIR}\\\" ) - ENDIF(WITH_FFMPEG) + ENDIF(WITH_CODEC_FFMPEG) - IF(WITH_SNDFILE) + IF(WITH_CODEC_SNDFILE) ADD_CUSTOM_COMMAND(TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND copy /Y \"${LIBDIR}\\sndfile\\lib\\libsndfile-1.dll\" \"${TARGETDIR}\\\" ) - ENDIF(WITH_SNDFILE) + ENDIF(WITH_CODEC_SNDFILE) IF(WITH_JACK) ADD_CUSTOM_COMMAND(TARGET blender @@ -562,6 +562,7 @@ ENDIF(WITH_MOD_FLUID) bf_intern_moto extern_glew extern_openjpeg + extern_redcode ge_videotex bf_rna bf_dna @@ -581,9 +582,9 @@ ENDIF(WITH_MOD_FLUID) LIST(APPEND BLENDER_SORTED_LIBS bf_intern_itasc) ENDIF(WITH_IK_ITASC) - IF(WITH_QUICKTIME) + IF(WITH_CODEC_QUICKTIME) LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime) - ENDIF(WITH_QUICKTIME) + ENDIF(WITH_CODEC_QUICKTIME) FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index ae46d8bf5b0..66a26e9ff79 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -53,8 +53,8 @@ SET(SRC ADD_DEFINITIONS(-DGLEW_STATIC) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) BLENDERLIB(ge_blen_routines "${SRC}" "${INC}") diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 01e0cb45cd4..906ece9ded8 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -72,8 +72,8 @@ SET(SRC ADD_DEFINITIONS(-DGLEW_STATIC) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) BLENDERLIB_NOLIST(ge_player_ghost "${SRC}" "${INC}") diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 25388171cac..a7c8ad9d0dd 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -208,9 +208,9 @@ ELSE(WITH_SDL) ADD_DEFINITIONS(-DDISABLE_SDL) ENDIF(WITH_SDL) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) IF(WITH_BULLET) ADD_DEFINITIONS(-DUSE_BULLET) diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt index 8e5c892f007..10c9bf3755a 100644 --- a/source/gameengine/VideoTexture/CMakeLists.txt +++ b/source/gameengine/VideoTexture/CMakeLists.txt @@ -85,10 +85,10 @@ SET(SRC VideoFFmpeg.h ) -IF(WITH_FFMPEG) +IF(WITH_CODEC_FFMPEG) SET(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC}) ADD_DEFINITIONS(-DWITH_FFMPEG) ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS) -ENDIF(WITH_FFMPEG) +ENDIF(WITH_CODEC_FFMPEG) BLENDERLIB(ge_videotex "${SRC}" "${INC}") |