build options to disable image formats WITH_CINEON, WITH_HDR.

- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.

8 files changed, 56 insertions, 17 deletions

diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index ebe3f913508..be826654311 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -32,9 +32,9 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
-IF(NOT WITH_ELBEEM)
+IF(NOT WITH_FLUID)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
+ENDIF(NOT WITH_FLUID)
 
 IF(WITH_OPENMP)
 		ADD_DEFINITIONS(-DPARALLEL=1)
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index 021e25953b0..5cbe9bbe0ba 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -36,21 +36,29 @@ SET(INC
 	../../windowmanager
 )
 
-IF(WITH_OPENEXR)
+IF(WITH_IMAGE_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
+ENDIF(WITH_IMAGE_OPENEXR)
 
-IF(WITH_TIFF)
+IF(WITH_IMAGE_TIFF)
 	ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
+ENDIF(WITH_IMAGE_TIFF)
 
-IF(WITH_OPENJPEG)
+IF(WITH_IMAGE_OPENJPEG)
 	ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
 
-IF(WITH_DDS)
+IF(WITH_IMAGE_DDS)
 	ADD_DEFINITIONS(-DWITH_DDS)
-ENDIF(WITH_DDS)
+ENDIF(WITH_IMAGE_DDS)
+
+IF(WITH_IMAGE_CINEON)
+	ADD_DEFINITIONS(-DWITH_CINEON)
+ENDIF(WITH_IMAGE_CINEON)
+
+IF(WITH_IMAGE_HDR)
+	ADD_DEFINITIONS(-DWITH_HDR)
+ENDIF(WITH_IMAGE_HDR)
 
 IF(WIN32)
 	SET(INC ${INC} ${PTHREADS_INC})
diff --git a/source/blender/editors/space_file/Makefile b/source/blender/editors/space_file/Makefile
index 29548b51222..48f6879b029 100644
--- a/source/blender/editors/space_file/Makefile
+++ b/source/blender/editors/space_file/Makefile
@@ -67,3 +67,10 @@ ifeq ($(WITH_TIFF), true)
     CPPFLAGS += -DWITH_TIFF
 endif
 
+ifeq ($(WITH_CINEON), true)
+    CPPFLAGS += -DWITH_CINEON
+endif
+
+ifeq ($(WITH_HDR), true)
+    CPPFLAGS += -DWITH_HDR
+endif
\ No newline at end of file
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index f31b8a4b05f..a6668d9a5fe 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -853,7 +853,13 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
 				||	BLI_testextensie(file->relname, ".pntg") //macpaint
 				||	BLI_testextensie(file->relname, ".qtif")
 				||	BLI_testextensie(file->relname, ".sgi")
+#ifdef WITH_HDR
 				||	BLI_testextensie(file->relname, ".hdr")
+#endif
+#ifdef WITH_CINEON
+				||	BLI_testextensie(file->relname, ".cin")
+				||	BLI_testextensie(file->relname, ".dpx")
+#endif
 #ifdef WITH_DDS
 				||	BLI_testextensie(file->relname, ".dds")
 #endif
@@ -916,7 +922,13 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
 				||	BLI_testextensie(file->relname, ".tif")
 				||	BLI_testextensie(file->relname, ".tiff")
 				||	BLI_testextensie(file->relname, ".tx")
+#ifdef WITH_HDR
 				||	BLI_testextensie(file->relname, ".hdr")
+#endif
+#ifdef WITH_CINEON				
+				||	BLI_testextensie(file->relname, ".cin")
+				||	BLI_testextensie(file->relname, ".dpx")
+#endif
 #ifdef WITH_DDS
 				||	BLI_testextensie(file->relname, ".dds")
 #endif
diff --git a/source/blender/editors/space_file/writeimage.c b/source/blender/editors/space_file/writeimage.c
index 05efdc12596..131e9fa0e14 100644
--- a/source/blender/editors/space_file/writeimage.c
+++ b/source/blender/editors/space_file/writeimage.c
@@ -125,9 +125,11 @@ static void save_rendered_image_cb_real(char *name, int confirm)
 void save_image_filesel_str(Scene *scene, char *str)
 {
 	switch(scene->r.imtype) {
+#ifdef WITH_HDR
 		case R_RADHDR:
 			strcpy(str, "Save Radiance HDR");
 			break;
+#endif
 		case R_FFMPEG:
 		case R_H264:
 		case R_XVID:
@@ -153,12 +155,14 @@ void save_image_filesel_str(Scene *scene, char *str)
 			strcpy(str, "Save OpenEXR");
 			break;
 #endif
+#ifdef WITH_CINEON
 		case R_CINEON:
 			strcpy(str, "Save Cineon");
 			break;
 		case R_DPX:
 			strcpy(str, "Save DPX");
 			break;
+#endif
 		case R_RAWTGA:
 			strcpy(str, "Save Raw Targa");
 			break;
@@ -168,9 +172,6 @@ void save_image_filesel_str(Scene *scene, char *str)
 		case R_IRIZ:
 			strcpy(str, "Save IRIS");
 			break;
-		case R_HAMX:
-			strcpy(str, "Save HAMX");
-			break;
 		case R_TARGA:
 			strcpy(str, "Save Targa");
 			break;
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 71eebdb9b1e..f644338d39d 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -33,13 +33,13 @@ SET(INC
 	../../windowmanager
 )
 
-IF(WITH_OPENEXR)
+IF(WITH_IMAGE_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
+ENDIF(WITH_IMAGE_OPENEXR)
 
-IF(WITH_TIFF)
+IF(WITH_IMAGE_TIFF)
 	ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
+ENDIF(WITH_IMAGE_TIFF)
 
 IF(WITH_LCMS)
 	SET(INC ${INC} ${LCMS_INCLUDE_DIR})
diff --git a/source/blender/editors/space_image/Makefile b/source/blender/editors/space_image/Makefile
index 4f532166bc7..cde31085d80 100644
--- a/source/blender/editors/space_image/Makefile
+++ b/source/blender/editors/space_image/Makefile
@@ -61,3 +61,10 @@ ifeq ($(WHITH_TIFF), true)
     CPPFLAGS += -DWITH_TIFF
 endif
 
+ifeq ($(WHITH_CINEON), true)
+    CPPFLAGS += -DWITH_CINEON
+endif
+
+ifeq ($(WHITH_HDR), true)
+    CPPFLAGS += -DWITH_HDR
+endif
\ No newline at end of file
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index d69c34ad259..4246516b5bc 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -648,9 +648,13 @@ static const EnumPropertyItem image_file_type_items[] = {
 #ifdef WITH_TIFF
 		{R_TIFF, "TIFF", 0, "Tiff", ""},
 #endif
+#ifdef WITH_DDS
 		{R_RADHDR, "RADIANCE_HDR", 0, "Radiance HDR", ""},
+#endif
+#ifdef WITH_CINEON
 		{R_CINEON, "CINEON", 0, "Cineon", ""},
 		{R_DPX, "DPX", 0, "DPX", ""},
+#endif
 #ifdef WITH_OPENEXR
 		{R_OPENEXR, "OPENEXR", 0, "OpenEXR", ""},
 	/* saving sequences of multilayer won't work, they copy buffers  */