Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

build options to disable image formats WITH_CINEON, WITH_HDR.

Browse Source 
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
This commit is contained in:
Campbell Barton
2010-08-03 11:25:34 +00:00
parent 940d1dcd0a
commit 957976882d
43 changed files with 314 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/creator/CMakeLists.txt
View File

@@ -52,13 +52,25 @@ IF(WITH_QUICKTIME)
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
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_IMAGE_DDS)
ADD_DEFINITIONS(-DWITH_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(WITH_PYTHON)
INCLUDE_DIRECTORIES(../blender/python)
@@ -377,9 +389,9 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager blender_render)
IF(WITH_ELBEEM)
IF(WITH_FLUID)
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
ENDIF(WITH_ELBEEM)
ENDIF(WITH_FLUID)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)

8
source/creator/Makefile
View File

@@ -73,4 +73,12 @@ ifeq ($(WITH_TIFF), true)
CPPFLAGS += -DWITH_TIFF
endif
ifeq ($(WITH_CINEON), true)
CPPFLAGS += -DWITH_CINEON
endif
ifeq ($(WITH_HDR), true)
CPPFLAGS += -DWITH_HDR
endif
CPPFLAGS += -I$(OPENGL_HEADERS)

4
source/creator/creator.c
View File

@@ -559,7 +559,9 @@ static int set_image_type(int argc, char **argv, void *data)
else if (!strcmp(imtype,"AVICODEC")) scene->r.imtype = R_AVICODEC;
else if (!strcmp(imtype,"QUICKTIME")) scene->r.imtype = R_QUICKTIME;
else if (!strcmp(imtype,"BMP")) scene->r.imtype = R_BMP;
#ifdef WITH_HDR
else if (!strcmp(imtype,"HDR")) scene->r.imtype = R_RADHDR;
#endif
#ifdef WITH_TIFF
else if (!strcmp(imtype,"TIFF")) scene->r.imtype = R_TIFF;
#endif
@@ -569,8 +571,10 @@ static int set_image_type(int argc, char **argv, void *data)
#endif
else if (!strcmp(imtype,"MPEG")) scene->r.imtype = R_FFMPEG;
else if (!strcmp(imtype,"FRAMESERVER")) scene->r.imtype = R_FRAMESERVER;
#ifdef WITH_CINEON
else if (!strcmp(imtype,"CINEON")) scene->r.imtype = R_CINEON;
else if (!strcmp(imtype,"DPX")) scene->r.imtype = R_DPX;
#endif
#if WITH_OPENJPEG
else if (!strcmp(imtype,"JP2")) scene->r.imtype = R_JP2;
#endif