bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Add option for CMake to build libredcode, also use CODEC prefix for ffmpeg, quicktime & sndfile options.

Browse Source
This commit is contained in:
Campbell Barton 2010-11-30 18:52:39 +00:00
parent c22dcbdd64
commit 42d6603cae
21 changed files with 164 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
CMakeLists.txt
View File

@ -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

24
build_files/cmake/macros.cmake
View File

@ -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})

4
extern/CMakeLists.txt vendored
View File

@ -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)

42
extern/libredcode/CMakeLists.txt vendored Normal file
View File

@ -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}")

8
intern/audaspace/CMakeLists.txt
View File

@ -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)

4
intern/ghost/CMakeLists.txt
View File

@ -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})

4
source/blender/CMakeLists.txt
View File

@ -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)

8
source/blender/blenkernel/CMakeLists.txt
View File

@ -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})

4
source/blender/blenpluginapi/CMakeLists.txt
View File

@ -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}")

4
source/blender/editors/render/CMakeLists.txt
View File

@ -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)

26
source/blender/imbuf/CMakeLists.txt
View File

@ -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})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
IF(WITH_IMAGE_REDCODE)
LIST(APPEND INC ${REDCODE_INC})
ADD_DEFINITIONS(-DWITH_REDCODE)
ENDIF(WITH_IMAGE_REDCODE)
IF(WITH_FFMPEG)
SET(INC ${INC} ${FFMPEG_INC})
IF(WITH_CODEC_QUICKTIME)
LIST(APPEND INC
../quicktime
${QUICKTIME_INC}
)
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_CODEC_QUICKTIME)
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)

2
source/blender/imbuf/intern/util.c
View File

@ -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) {

8
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -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})

4
source/blender/render/CMakeLists.txt
View File

@ -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")

8
source/blender/windowmanager/CMakeLists.txt
View File

@ -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})

8
source/blenderplayer/CMakeLists.txt
View File

@ -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)

17
source/creator/CMakeLists.txt
View File

@ -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})

4
source/gameengine/BlenderRoutines/CMakeLists.txt
View File

@ -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}")

4
source/gameengine/GamePlayer/ghost/CMakeLists.txt
View File

@ -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}")

4
source/gameengine/Ketsji/CMakeLists.txt
View File

@ -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)

4
source/gameengine/VideoTexture/CMakeLists.txt
View File

@ -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}")