Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2011-11-09 21:22:55 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2011-11-09 21:22:55 +0400
commitf0adbb7746748f254533e3060e5965b3103fda97 (patch)
tree26373a93fd01d4885d0220fac1997d8eb6eb1f08 /build_files/scons/config/win64-vc-config.py
parent1ff2018842554209697d23ed83577af8ed39eb54 (diff)
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init.
Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
Diffstat (limited to 'build_files/scons/config/win64-vc-config.py')
-rw-r--r--build_files/scons/config/win64-vc-config.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index d910bdc5ca6..8c2956666a9 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -156,17 +156,17 @@ WITH_BF_OPENMP = True
WITH_BF_CYCLES = True
WITH_BF_OIIO = True
-BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = '#../lib/win64/openimageio/include'
+BF_OIIO = '${LIBDIR}/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
BF_OIIO_LIB = 'OpenImageIO'
BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-BF_OIIO_LIBPATH = '#../lib/win64/openimageio/lib'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
WITH_BF_BOOST = True
-BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '#../lib/win64/boost/include'
+BF_BOOST = '${LIBDIR}/boost'
+BF_BOOST_INC = '${BF_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 = '#../lib/win64/boost/lib'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True