archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OSX: CMake and scons default settings updated to allow build with LCMS lib

Browse Source
This commit is contained in:
Damien Plisson
2010-07-03 10:01:41 +00:00
parent de3dc33494
commit ec770b7538
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -711,7 +711,12 @@ IF(APPLE)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib) SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR) ENDIF(WITH_OPENEXR)
# TODO: IF(WITH_LCMS) IF(WITH_LCMS)
SET(LCMS ${LIBDIR}/lcms)
SET(LCMS_INCLUDE_DIR ${LCMS}/include)
SET(LCMS_LIBRARY lcms)
SET(LCMS_LIBPATH ${LCMS}/lib)
ENDIF(WITH_LCMS)
IF(WITH_FFMPEG) IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg) SET(FFMPEG ${LIBDIR}/ffmpeg)

3
config/darwin-config.py
View File

@@ -151,6 +151,9 @@ BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf
WITH_BF_DDS = True WITH_BF_DDS = True
#Color Management System
WITH_BF_LCMS = True
WITH_BF_JPEG = True WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg' BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_INC = '${BF_JPEG}/include'