diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 15:25:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 15:25:34 +0400 |
commit | 957976882d084d9951760b154f414724d6ddb8be (patch) | |
tree | 9b81d50c17b64575949351ea1c733e90f6b118ae /source/blender/editors/space_file | |
parent | 940d1dcd0a9f88ec5a7b1ec0cf12dc7a6ddddf0b (diff) |
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.
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/CMakeLists.txt | 24 | ||||
-rw-r--r-- | source/blender/editors/space_file/Makefile | 7 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_file/writeimage.c | 7 |
4 files changed, 39 insertions, 11 deletions
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; |