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.
This commit is contained in:
Campbell Barton
@@ -69,7 +69,7 @@ OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
|
||||
OPTION(WITH_LCMS "Enable color correction with lcms" OFF)
|
||||
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
|
||||
OPTION(WITH_BUILDINFO "Include extra build details" ON)
|
||||
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
|
||||
OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON)
|
||||
OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
|
||||
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
|
||||
OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
|
||||
@@ -82,10 +82,12 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
# Image format support
|
||||
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
|
||||
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
|
||||
OPTION(WITH_TIFF "Enable LibTIFF Support" ON)
|
||||
OPTION(WITH_DDS "Enable DDS Support" ON)
|
||||
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_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)
|
||||
|
||||
# Audio format support
|
||||
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
|
||||
@@ -220,7 +222,7 @@ IF(UNIX AND NOT APPLE)
|
||||
ENDIF(NOT SDL_FOUND)
|
||||
ENDIF(WITH_SDL)
|
||||
|
||||
IF(WITH_OPENEXR)
|
||||
IF(WITH_IMAGE_OPENEXR)
|
||||
SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
|
||||
FIND_PATH(OPENEXR_INC
|
||||
ImfXdr.h
|
||||
@@ -235,16 +237,16 @@ IF(UNIX AND NOT APPLE)
|
||||
SET(OPENEXR_LIB Half IlmImf Iex Imath)
|
||||
|
||||
IF(NOT OPENEXR_INC)
|
||||
SET(WITH_OPENEXR OFF)
|
||||
SET(WITH_IMAGE_OPENEXR OFF)
|
||||
ENDIF(NOT OPENEXR_INC)
|
||||
ENDIF(WITH_OPENEXR)
|
||||
ENDIF(WITH_IMAGE_OPENEXR)
|
||||
|
||||
IF(WITH_TIFF)
|
||||
IF(WITH_IMAGE_TIFF)
|
||||
FIND_PACKAGE(TIFF)
|
||||
IF(NOT TIFF_FOUND)
|
||||
SET(WITH_TIFF OFF)
|
||||
SET(WITH_IMAGE_TIFF OFF)
|
||||
ENDIF(NOT TIFF_FOUND)
|
||||
ENDIF(WITH_TIFF)
|
||||
ENDIF(WITH_IMAGE_TIFF)
|
||||
|
||||
FIND_PACKAGE(JPEG REQUIRED)
|
||||
|
||||
@@ -497,7 +499,7 @@ IF(WIN32)
|
||||
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
||||
ENDIF(WITH_FFMPEG)
|
||||
|
||||
IF(WITH_OPENEXR)
|
||||
IF(WITH_IMAGE_OPENEXR)
|
||||
SET(OPENEXR ${LIBDIR}/openexr)
|
||||
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
|
||||
SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
|
||||
@@ -509,14 +511,14 @@ IF(WIN32)
|
||||
IF (MSVC90)
|
||||
SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
|
||||
ENDIF(MSVC90)
|
||||
ENDIF(WITH_OPENEXR)
|
||||
ENDIF(WITH_IMAGE_OPENEXR)
|
||||
|
||||
IF(WITH_TIFF)
|
||||
IF(WITH_IMAGE_TIFF)
|
||||
SET(TIFF ${LIBDIR}/tiff)
|
||||
SET(TIFF_LIBRARY libtiff)
|
||||
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
|
||||
SET(TIFF_LIBPATH ${TIFF}/lib)
|
||||
ENDIF(WITH_TIFF)
|
||||
ENDIF(WITH_IMAGE_TIFF)
|
||||
|
||||
IF(WITH_JACK)
|
||||
SET(JACK ${LIBDIR}/jack)
|
||||
@@ -607,19 +609,19 @@ IF(WIN32)
|
||||
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
||||
ENDIF(WITH_FFMPEG)
|
||||
|
||||
IF(WITH_OPENEXR)
|
||||
IF(WITH_IMAGE_OPENEXR)
|
||||
SET(OPENEXR ${LIBDIR}/gcc/openexr)
|
||||
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
|
||||
SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
|
||||
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
|
||||
ENDIF(WITH_OPENEXR)
|
||||
ENDIF(WITH_IMAGE_OPENEXR)
|
||||
|
||||
IF(WITH_TIFF)
|
||||
IF(WITH_IMAGE_TIFF)
|
||||
SET(TIFF ${LIBDIR}/gcc/tiff)
|
||||
SET(TIFF_LIBRARY tiff)
|
||||
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
|
||||
SET(TIFF_LIBPATH ${TIFF}/lib)
|
||||
ENDIF(WITH_TIFF)
|
||||
ENDIF(WITH_IMAGE_TIFF)
|
||||
|
||||
IF(WITH_JACK)
|
||||
SET(JACK ${LIBDIR}/jack)
|
||||
@@ -727,12 +729,12 @@ IF(APPLE)
|
||||
SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
|
||||
SET(FREETYPE_LIBRARY freetype)
|
||||
|
||||
IF(WITH_OPENEXR)
|
||||
IF(WITH_IMAGE_OPENEXR)
|
||||
SET(OPENEXR ${LIBDIR}/openexr)
|
||||
SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
|
||||
SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
|
||||
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
|
||||
ENDIF(WITH_OPENEXR)
|
||||
ENDIF(WITH_IMAGE_OPENEXR)
|
||||
|
||||
IF(WITH_LCMS)
|
||||
SET(LCMS ${LIBDIR}/lcms)
|
||||
@@ -810,12 +812,12 @@ IF(APPLE)
|
||||
SET(JPEG_INC "${JPEG}/include")
|
||||
SET(JPEG_LIBPATH ${JPEG}/lib)
|
||||
|
||||
IF(WITH_TIFF)
|
||||
IF(WITH_IMAGE_TIFF)
|
||||
SET(TIFF ${LIBDIR}/tiff)
|
||||
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
|
||||
SET(TIFF_LIBRARY tiff)
|
||||
SET(TIFF_LIBPATH ${TIFF}/lib)
|
||||
ENDIF(WITH_TIFF)
|
||||
ENDIF(WITH_IMAGE_TIFF)
|
||||
|
||||
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
|
||||
SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
|
||||
@@ -869,11 +871,11 @@ ENDIF(WITH_BUILDINFO)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Common.
|
||||
IF(WITH_OPENJPEG)
|
||||
IF(WITH_IMAGE_OPENJPEG)
|
||||
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
|
||||
set(OPENJPEG_INC ${OPENJPEG})
|
||||
set(OPENJPEG_LIb extern_libopenjpeg)
|
||||
ENDIF(WITH_OPENJPEG)
|
||||
ENDIF(WITH_IMAGE_OPENJPEG)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Blender WebPlugin
|
||||
|
||||
Reference in New Issue
Block a user