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

15 files changed, 58 insertions, 49 deletions

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