[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41685] trunk/blender/build_files/scons/ config/win64-vc-config.py: Scons:

[Sergey I. Sharybin]

Hi,

This looks a bit strange for me. In theory, '${BF_OIIO}/include' and 
'#../lib/win64/openimageio/include' should be the same paths and using 
${BF_OIIO} is more flexible for build systems (at least for linux).

Maybe error was in how this path is used by SConstruct?

Thomas Dinges wrote:
> Revision: 41685
>            http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41685
> Author:   dingto
> Date:     2011-11-08 21:17:42 +0000 (Tue, 08 Nov 2011)
> Log Message:
> -----------
> Scons:
> * Fixing x64 compile with Cycles.
>
> Modified Paths:
> --------------
>      trunk/blender/build_files/scons/config/win64-vc-config.py
>
> Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
> ===================================================================
> --- trunk/blender/build_files/scons/config/win64-vc-config.py	2011-11-08 20:56:55 UTC (rev 41684)
> +++ trunk/blender/build_files/scons/config/win64-vc-config.py	2011-11-08 21:17:42 UTC (rev 41685)
> @@ -157,15 +157,16 @@
>
>   WITH_BF_OIIO = True
>   BF_OIIO = LIBDIR + '/openimageio'
> -BF_OIIO_INC = '${BF_OIIO}/include'
> +BF_OIIO_INC = '#../lib/win64/openimageio/include'
>   BF_OIIO_LIB = 'OpenImageIO'
>   BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
> +BF_OIIO_LIBPATH = '#../lib/win64/openimageio/lib'
>
>   WITH_BF_BOOST = True
>   BF_BOOST = LIBDIR + '/boost'
> -BF_BOOST_INC = '${BF_BOOST}/include'
> +BF_BOOST_INC = '#../lib/win64/boost/include'
>   BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
> -BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
> +BF_BOOST_LIBPATH = '#../lib/win64/boost/lib'
>
>   #Ray trace optimization
>   WITH_BF_RAYOPTIMIZATION = True
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>


-- 
With best regards, Sergey I. Sharybin