[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32326] trunk/blender: Enable lcms support on Windows.
Matt Ebb
matt at mke3.net
Wed Oct 6 00:15:29 CEST 2010
Hi, I mentioned this to campbell before, but that lcms stuff needs to be removed - it was only ever there are a quick test that martin committed, ifdefed out, and before color management was implemented. Lcms is currently not used for anything in blender, and v1 is not very functional for our purposes either. In the future it would be good to integrate lcms2 into the colour management system, but that's another project for later.
cheers
Matt
On 06/10/2010, at 00:39 , Nathan Letwory wrote:
> Revision: 32326
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32326
> Author: jesterking
> Date: 2010-10-05 15:39:45 +0200 (Tue, 05 Oct 2010)
>
> Log Message:
> -----------
> Enable lcms support on Windows.
>
> Modified Paths:
> --------------
> trunk/blender/CMakeLists.txt
> trunk/blender/build_files/cmake/macros.cmake
> trunk/blender/build_files/scons/config/win32-vc-config.py
> trunk/blender/build_files/scons/config/win64-vc-config.py
> trunk/blender/build_files/scons/tools/btools.py
>
> Modified: trunk/blender/CMakeLists.txt
> ===================================================================
> --- trunk/blender/CMakeLists.txt 2010-10-05 13:37:54 UTC (rev 32325)
> +++ trunk/blender/CMakeLists.txt 2010-10-05 13:39:45 UTC (rev 32326)
> @@ -478,13 +478,15 @@
> SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
> SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
> SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
> - #pcre is bundled with openCollada
> - #SET(PCRE ${LIBDIR}/pcre)
> - #SET(PCRE_LIBPATH ${PCRE}/lib)
> SET(PCRE_LIB pcre)
> ENDIF(WITH_OPENCOLLADA)
>
> - # TODO: IF(WITH_LCMS)
> + IF(WITH_LCMS)
> + SET(LCMS ${LIBDIR}/lcms)
> + SET(LCMS_INC ${LCMS}/include)
> + SET(LCMS_LIBPATH ${LCMS}/lib)
> + SET(LCMS_LIB lcms)
> + ENDIF(WITH_LCMS)
>
> IF(WITH_FFMPEG)
> SET(FFMPEG ${LIBDIR}/ffmpeg)
> @@ -606,9 +608,6 @@
> SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
> SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
> SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
> - #pcre is bundled with openCollada
> - #SET(PCRE ${LIBDIR}/pcre)
> - #SET(PCRE_LIBPATH ${PCRE}/lib)
> SET(PCRE_LIB pcre)
> ENDIF(WITH_OPENCOLLADA)
>
>
> Modified: trunk/blender/build_files/cmake/macros.cmake
> ===================================================================
> --- trunk/blender/build_files/cmake/macros.cmake 2010-10-05 13:37:54 UTC (rev 32325)
> +++ trunk/blender/build_files/cmake/macros.cmake 2010-10-05 13:39:45 UTC (rev 32326)
> @@ -172,11 +172,17 @@
> TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB})
> ENDIF(EXPAT_LIB)
> ELSE(WIN32)
> - TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
> + TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
> TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
> TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
> ENDIF(WIN32)
> ENDIF(WITH_OPENCOLLADA)
> + IF(WITH_LCMS)
> + IF(WIN32)
> + TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d)
> + TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB})
> + ENDIF(WIN32)
> + ENDIF(WITH_LCMS)
> IF(WIN32)
> TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
> ENDIF(WIN32)
>
> Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
> ===================================================================
> --- trunk/blender/build_files/scons/config/win32-vc-config.py 2010-10-05 13:37:54 UTC (rev 32325)
> +++ trunk/blender/build_files/scons/config/win32-vc-config.py 2010-10-05 13:39:45 UTC (rev 32326)
> @@ -149,6 +149,12 @@
> BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
> BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
>
> +WITH_BF_LCMS = True
> +BF_LCMS = LIBDIR + '/lcms'
> +BF_LCMS_INC = '${BF_LCMS}/include'
> +BF_LCMS_LIB = 'lcms'
> +BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
> +
> #Ray trace optimization
> WITH_BF_RAYOPTIMIZATION = True
> BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
> @@ -188,7 +194,6 @@
> # BF_PROFILE_LINKFLAGS = ['-pg']
> # BF_PROFILE = False
>
> -#turn off makebsc by default ( as 64 bit version does ) .. takes ages to build .. for nothing ( well some M$ addicts may disagree )
> BF_BSC=False
>
> BF_BUILDDIR = '..\\build\\win32-vc'
>
> Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
> ===================================================================
> --- trunk/blender/build_files/scons/config/win64-vc-config.py 2010-10-05 13:37:54 UTC (rev 32325)
> +++ trunk/blender/build_files/scons/config/win64-vc-config.py 2010-10-05 13:39:45 UTC (rev 32326)
> @@ -107,23 +107,6 @@
>
> WITH_BF_BINRELOC = False
>
> -#WITH_BF_NSPR = True
> -#BF_NSPR = $(LIBDIR)/nspr
> -#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
> -#BF_NSPR_LIB =
> -
> -# Uncomment the following line to use Mozilla inplace of netscape
> -#CPPFLAGS += -DMOZ_NOT_NET
> -# Location of MOZILLA/Netscape header files...
> -#BF_MOZILLA = $(LIBDIR)/mozilla
> -#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
> -#BF_MOZILLA_LIB =
> -# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
> -# if this is not set.
> -#
> -# Be paranoid regarding library creation (do not update archives)
> -#BF_PARANOID = True
> -
> # enable freetype2 support for text objects
> BF_WITH_FREETYPE = True
> BF_FREETYPE = LIBDIR + '/freetype'
> @@ -162,6 +145,12 @@
> BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
> BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
>
> +WITH_BF_LCMS = True
> +BF_LCMS = LIBDIR + '/lcms'
> +BF_LCMS_INC = '${BF_LCMS}/include'
> +BF_LCMS_LIB = 'lcms'
> +BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
> +
> #Ray trace optimization
> WITH_BF_RAYOPTIMIZATION = True
> BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
> @@ -194,9 +183,6 @@
>
> LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
>
> -BF_DEBUG=False
> -BF_BSC=False
> -
> if BF_DEBUG:
> BF_NUMJOBS=1
> else:
> @@ -207,10 +193,3 @@
> BF_BUILDDIR = '..\\build\\blender25-win64-vc'
> BF_INSTALLDIR='..\\install\\blender25-win64-vc'
>
> -
> -
> -######################### MERGE WITH ABOVE ################################
> -
> -
> -
> -
>
> Modified: trunk/blender/build_files/scons/tools/btools.py
> ===================================================================
> --- trunk/blender/build_files/scons/tools/btools.py 2010-10-05 13:37:54 UTC (rev 32325)
> +++ trunk/blender/build_files/scons/tools/btools.py 2010-10-05 13:39:45 UTC (rev 32326)
> @@ -408,7 +408,7 @@
> ('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', ''),
> ('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', ''),
>
> - (BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', True)),
> + (BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', False)),
>
> ('BF_BUILDDIR', 'Build dir', ''),
> ('BF_INSTALLDIR', 'Installation dir', ''),
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
More information about the Bf-committers
mailing list