[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38021] trunk/lib/windows: Cycles: windows debug libs and fix for crash loading png files.

Brecht Van Lommel brechtvanlommel at pandora.be
Fri Jul 1 17:03:11 CEST 2011 

Revision: 38021
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38021
Author:   blendix
Date:     2011-07-01 15:03:11 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
Cycles: windows debug libs and fix for crash loading png files.

Libs were compiled with VS 2008 express, so users may need to install "Microsoft Visual C++ 2008 Redistributable Package" to run builds made with these. There's instructions for how to build included, so it shouldn't be too hard for someone with a full version to make better libs once.

Modified Paths:
--------------
    trunk/lib/windows/boost/build.bat
    trunk/lib/windows/openimageio/bin/OpenImageIO.dll
    trunk/lib/windows/openimageio/build.bat
    trunk/lib/windows/openimageio/lib/OpenImageIO.lib
    trunk/lib/windows/openimageio/readme.txt

Added Paths:
-----------
    trunk/lib/windows/boost/lib/libboost_date_time-vc90-mt-sgd-1_46_1.lib
    trunk/lib/windows/boost/lib/libboost_filesystem-vc90-mt-sgd-1_46_1.lib
    trunk/lib/windows/boost/lib/libboost_regex-vc90-mt-sgd-1_46_1.lib
    trunk/lib/windows/boost/lib/libboost_system-vc90-mt-sgd-1_46_1.lib
    trunk/lib/windows/boost/lib/libboost_thread-vc90-mt-sgd-1_46_1.lib
    trunk/lib/windows/openimageio/bin/OpenImageIO_d.dll
    trunk/lib/windows/openimageio/lib/OpenImageIO_d.lib

Modified: trunk/lib/windows/boost/build.bat
===================================================================
--- trunk/lib/windows/boost/build.bat	2011-07-01 14:57:48 UTC (rev 38020)
+++ trunk/lib/windows/boost/build.bat	2011-07-01 15:03:11 UTC (rev 38021)
@@ -3,6 +3,7 @@
 :: build
 call bootstrap.bat
 bjam -j4 variant=release link=static runtime-link=static threading=multi --with-filesystem --with-thread --with-regex --with-system --with-date_time stage
+bjam -j4 variant=debug link=static runtime-link=static threading=multi --with-filesystem --with-thread --with-regex --with-system --with-date_time stage
 
 :: copy files
 mkdir ..\lib

Added: trunk/lib/windows/boost/lib/libboost_date_time-vc90-mt-sgd-1_46_1.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/boost/lib/libboost_date_time-vc90-mt-sgd-1_46_1.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/lib/windows/boost/lib/libboost_filesystem-vc90-mt-sgd-1_46_1.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/boost/lib/libboost_filesystem-vc90-mt-sgd-1_46_1.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/lib/windows/boost/lib/libboost_regex-vc90-mt-sgd-1_46_1.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/boost/lib/libboost_regex-vc90-mt-sgd-1_46_1.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/lib/windows/boost/lib/libboost_system-vc90-mt-sgd-1_46_1.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/boost/lib/libboost_system-vc90-mt-sgd-1_46_1.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/lib/windows/boost/lib/libboost_thread-vc90-mt-sgd-1_46_1.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/boost/lib/libboost_thread-vc90-mt-sgd-1_46_1.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/lib/windows/openimageio/bin/OpenImageIO.dll
===================================================================
(Binary files differ)

Added: trunk/lib/windows/openimageio/bin/OpenImageIO_d.dll
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/openimageio/bin/OpenImageIO_d.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/lib/windows/openimageio/build.bat
===================================================================
--- trunk/lib/windows/openimageio/build.bat	2011-07-01 14:57:48 UTC (rev 38020)
+++ trunk/lib/windows/openimageio/build.bat	2011-07-01 15:03:11 UTC (rev 38021)
@@ -19,7 +19,7 @@
 cd build\windows
 
 cmake -G "NMake Makefiles" ..\..\src ^
- -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio\release ^
  -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
  -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Half.lib ^
  -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Imath.lib ^
@@ -29,10 +29,11 @@
  -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmImf.lib ^
  -DLINKSTATIC=ON ^
  -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
  -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
  -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz.lib ^
  -DPNG_PNG_INCLUDE_DIR=%LIBDIR%\png\include ^
- -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng.lib ^
+ -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng_st.lib ^
  -DJPEG_INCLUDE_DIR=%LIBDIR%\jpeg\include ^
  -DJPEG_LIBRARY=%LIBDIR%\jpeg\lib\libjpeg.lib ^
  -DTIFF_INCLUDE_DIR=%LIBDIR%\tiff\include ^
@@ -49,3 +50,39 @@
 
 cd ..\..
 
+:: create build directory
+mkdir build\windows_debug
+cd build\windows_debug
+
+cmake -G "NMake Makefiles" ..\..\src ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio\debug ^
+ -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Half_d.lib ^
+ -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Imath_d.lib ^
+ -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmThread_d.lib ^
+ -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Iex_d.lib ^
+ -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmImf_d.lib ^
+ -DLINKSTATIC=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
+ -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz.lib ^
+ -DPNG_PNG_INCLUDE_DIR=%LIBDIR%\png\include ^
+ -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng_st.lib ^
+ -DJPEG_INCLUDE_DIR=%LIBDIR%\jpeg\include ^
+ -DJPEG_LIBRARY=%LIBDIR%\jpeg\lib\libjpeg.lib ^
+ -DTIFF_INCLUDE_DIR=%LIBDIR%\tiff\include ^
+ -DTIFF_LIBRARY=%LIBDIR%\tiff\lib\libtiff.lib ^
+ -DUSE_OPENGL=OFF ^
+ -DUSE_TBB=OFF ^
+ -DUSE_FIELD3D=OFF ^
+ -DUSE_QT=OFF ^
+ -DUSE_PYTHON=OFF ^
+ -DCMAKE_BUILD_TYPE=Debug
+
+nmake
+nmake install
+
+cd ..\..
+

Modified: trunk/lib/windows/openimageio/lib/OpenImageIO.lib
===================================================================
(Binary files differ)

Added: trunk/lib/windows/openimageio/lib/OpenImageIO_d.lib
===================================================================
(Binary files differ)


Property changes on: trunk/lib/windows/openimageio/lib/OpenImageIO_d.lib
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/lib/windows/openimageio/readme.txt
===================================================================
--- trunk/lib/windows/openimageio/readme.txt	2011-07-01 14:57:48 UTC (rev 38020)
+++ trunk/lib/windows/openimageio/readme.txt	2011-07-01 15:03:11 UTC (rev 38021)
@@ -8,3 +8,5 @@
 * cd into lib/windows/openimageio/oiio
 * ..\build.bat
 
+* Note we build with /MT or /MTd to be compatible with lib/windows/openexr.
+

More information about the Bf-blender-cvs mailing list