== CMake ==

* updated for new libtiff
* also disabled opencollada for now as it caused errors

Note:
* WITH_INTERNATIONAL is enabled although this setting crashes Blender when compiling the Debug target - seems to work for other people though? If you encounter problems, try disabling this.
This commit is contained in:
Andrea Weikert 2010-05-27 18:22:50 +00:00
parent 717701ed0f
commit 1ba9766ab5

@ -92,7 +92,7 @@ IF(UNIX AND NOT APPLE)
OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
ELSE()
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON)
OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
ENDIF()
IF (APPLE)
@ -416,7 +416,7 @@ IF(WIN32)
SET(TIFF ${LIBDIR}/tiff)
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
SET(TIFF_LIBRARY tiff)
SET(TIFF_LIBRARY libtiff)
SET(TIFF_LIBPATH ${TIFF}/lib)
SET(WINTAB_INC ${LIBDIR}/wintab/include)