[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37960] trunk/lib/windows: Cycles: win32 openimageio library in lib/windows, compiled with visual studio 2008 .

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Jun 29 21:16:33 CEST 2011


Revision: 37960
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37960
Author:   blendix
Date:     2011-06-29 19:16:32 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
Cycles: win32 openimageio library in lib/windows, compiled with visual studio 2008.

Added Paths:
-----------
    trunk/lib/windows/openimageio/
    trunk/lib/windows/openimageio/LICENSE
    trunk/lib/windows/openimageio/bin/
    trunk/lib/windows/openimageio/bin/OpenImageIO.dll
    trunk/lib/windows/openimageio/build.bat
    trunk/lib/windows/openimageio/build.patch
    trunk/lib/windows/openimageio/include/
    trunk/lib/windows/openimageio/include/OpenImageIO/
    trunk/lib/windows/openimageio/include/OpenImageIO/argparse.h
    trunk/lib/windows/openimageio/include/OpenImageIO/colortransfer.h
    trunk/lib/windows/openimageio/include/OpenImageIO/dassert.h
    trunk/lib/windows/openimageio/include/OpenImageIO/errorhandler.h
    trunk/lib/windows/openimageio/include/OpenImageIO/export.h
    trunk/lib/windows/openimageio/include/OpenImageIO/filesystem.h
    trunk/lib/windows/openimageio/include/OpenImageIO/filter.h
    trunk/lib/windows/openimageio/include/OpenImageIO/fmath.h
    trunk/lib/windows/openimageio/include/OpenImageIO/hash.h
    trunk/lib/windows/openimageio/include/OpenImageIO/imagebuf.h
    trunk/lib/windows/openimageio/include/OpenImageIO/imagebufalgo.h
    trunk/lib/windows/openimageio/include/OpenImageIO/imagecache.h
    trunk/lib/windows/openimageio/include/OpenImageIO/imageio.h
    trunk/lib/windows/openimageio/include/OpenImageIO/osdep.h
    trunk/lib/windows/openimageio/include/OpenImageIO/paramlist.h
    trunk/lib/windows/openimageio/include/OpenImageIO/plugin.h
    trunk/lib/windows/openimageio/include/OpenImageIO/pugiconfig.hpp
    trunk/lib/windows/openimageio/include/OpenImageIO/pugixml.hpp
    trunk/lib/windows/openimageio/include/OpenImageIO/refcnt.h
    trunk/lib/windows/openimageio/include/OpenImageIO/strutil.h
    trunk/lib/windows/openimageio/include/OpenImageIO/sysutil.h
    trunk/lib/windows/openimageio/include/OpenImageIO/texture.h
    trunk/lib/windows/openimageio/include/OpenImageIO/thread.h
    trunk/lib/windows/openimageio/include/OpenImageIO/timer.h
    trunk/lib/windows/openimageio/include/OpenImageIO/typedesc.h
    trunk/lib/windows/openimageio/include/OpenImageIO/ustring.h
    trunk/lib/windows/openimageio/include/OpenImageIO/varyingref.h
    trunk/lib/windows/openimageio/include/OpenImageIO/version.h
    trunk/lib/windows/openimageio/lib/
    trunk/lib/windows/openimageio/lib/OpenImageIO.lib
    trunk/lib/windows/openimageio/readme.txt

Added: trunk/lib/windows/openimageio/LICENSE
===================================================================
--- trunk/lib/windows/openimageio/LICENSE	                        (rev 0)
+++ trunk/lib/windows/openimageio/LICENSE	2011-06-29 19:16:32 UTC (rev 37960)
@@ -0,0 +1,30 @@
+OpenImageIO and all code, documentation, and other materials contained
+therein are:
+
+Copyright 2008 Larry Gritz and the other authors and contributors.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of the software's owners nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+(This is the Modified BSD License)

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


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

Added: trunk/lib/windows/openimageio/build.bat
===================================================================
--- trunk/lib/windows/openimageio/build.bat	                        (rev 0)
+++ trunk/lib/windows/openimageio/build.bat	2011-06-29 19:16:32 UTC (rev 37960)
@@ -0,0 +1,51 @@
+ at Echo off
+
+set LIBDIR=%CD%\..\..
+
+:: hack to get compatible EXR headers
+set EXRINC=%LIBDIR%\openexr\include
+mkdir %LIBDIR%\openexr\include\OpenEXR
+xcopy /E /Y %EXRINC%\Iex %EXRINC%\OpenEXR\
+xcopy /E /Y %EXRINC%\IlmImf %EXRINC%\OpenEXR\
+xcopy /E /Y %EXRINC%\Imath %EXRINC%\OpenEXR\
+xcopy /E /Y %EXRINC%\IlmThread %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\half.h %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\halfFunction.h %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\halfLimits.h %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\IlmBaseConfig.h %EXRINC%\OpenEXR\
+
+:: create build directory
+mkdir build\windows
+cd build\windows
+
+cmake -G "NMake Makefiles" ..\..\src ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
+ -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Half.lib ^
+ -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Imath.lib ^
+ -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmThread.lib ^
+ -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Iex.lib ^
+ -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmImf.lib ^
+ -DLINKSTATIC=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -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 ^
+ -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=Release
+
+nmake
+nmake install
+
+cd ..\..
+

Added: trunk/lib/windows/openimageio/build.patch
===================================================================
--- trunk/lib/windows/openimageio/build.patch	                        (rev 0)
+++ trunk/lib/windows/openimageio/build.patch	2011-06-29 19:16:32 UTC (rev 37960)
@@ -0,0 +1,79 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f322e83..e6ec7e8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -116,20 +116,30 @@ if (MSVC)
+     if (BUILDSTATIC)
+          add_definitions(-DOIIO_STATIC_BUILD=1)
+     endif ()
++
++    set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
++    set(CMAKE_C_FLAGS_MINSIZEREL     "/MT /O1 /Ob1 /D NDEBUG")
++    set(CMAKE_C_FLAGS_RELEASE        "/MT /O2 /Ob2 /D NDEBUG")
++    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG")
++
++    set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
++    set(CMAKE_CXX_FLAGS_MINSIZEREL     "/MT /O1 /Ob1 /D NDEBUG")
++    set(CMAKE_CXX_FLAGS_RELEASE        "/MT /O2 /Ob2 /D NDEBUG")
++    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG")
+ endif (MSVC)
+ 
+ 
+ # Tell CMake to process the sub-directories
+ add_subdirectory (libOpenImageIO)
+ 
+-add_subdirectory (iconvert)
+-add_subdirectory (idiff)
+-add_subdirectory (igrep)
+-add_subdirectory (iinfo)
+-add_subdirectory (iprocess)
+-add_subdirectory (maketx)
+-add_subdirectory (testtex)
+-add_subdirectory (iv)
++#add_subdirectory (iconvert)
++#add_subdirectory (idiff)
++#add_subdirectory (igrep)
++#add_subdirectory (iinfo)
++#add_subdirectory (iprocess)
++#add_subdirectory (maketx)
++#add_subdirectory (testtex)
++#add_subdirectory (iv)
+ 
+ # Add IO plugin directories
+ if (NOT EMBEDPLUGINS)
+@@ -234,7 +244,7 @@ if (WIN32)
+     set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
+ #    set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
+     set(CPACK_NSIS_MODIFY_PATH ON)
+-    add_dll_files ()
++    #add_dll_files ()
+     include (InstallRequiredSystemLibraries)
+ endif ()
+ set (CPACK_SOURCE_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-source)
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 595ba92..d3b5c3d 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -82,7 +82,7 @@ endmacro ()
+ 
+ message (STATUS "BOOST_ROOT ${BOOST_ROOT}")
+ 
+-set (Boost_ADDITIONAL_VERSIONS "1.45" "1.44" 
++set (Boost_ADDITIONAL_VERSIONS "1.46" "1_46_1" "1.45" "1.44" 
+                                "1.43" "1.43.0" "1.42" "1.42.0" 
+                                "1.41" "1.41.0" "1.40" "1.40.0"
+                                "1.39" "1.39.0" "1.38" "1.38.0"
+diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index 8c162bc..d49c37a 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
++++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -207,6 +207,8 @@ oiio_install_targets (OpenImageIO)
+ if (NOT LINKSTATIC)
+     add_definitions (-DBOOST_TEST_DYN_LINK)
+     add_definitions (-DPTEX_EXPORTS)
++else ()
++    add_definitions (-DPTEX_STATIC)
+ endif ()
+ 
+ add_executable (imagebufalgo_test imagebufalgo_test.cpp)
+

Added: trunk/lib/windows/openimageio/include/OpenImageIO/argparse.h
===================================================================
--- trunk/lib/windows/openimageio/include/OpenImageIO/argparse.h	                        (rev 0)
+++ trunk/lib/windows/openimageio/include/OpenImageIO/argparse.h	2011-06-29 19:16:32 UTC (rev 37960)
@@ -0,0 +1,184 @@
+/*
+  Copyright 2008 Larry Gritz and the other authors and contributors.
+  All Rights Reserved.
+  Based on BSD-licensed software Copyright 2004 NVIDIA Corp.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  * Neither the name of the software's owners nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  (This is the Modified BSD License)
+*/
+
+
+/// \file
+/// \brief Simple parsing of program command-line arguments.
+
+
+#ifndef OPENIMAGEIO_ARGPARSE_H
+#define OPENIMAGEIO_ARGPARSE_H
+
+#include <vector>
+
+#include "export.h"
+#include "version.h"
+
+#ifndef OPENIMAGEIO_PRINTF_ARGS  /* See comments in strutil.h */
+#   ifndef __GNUC__
+#       define __attribute__(x)
+#   endif
+#   define OPENIMAGEIO_PRINTF_ARGS(fmtarg_pos, vararg_pos) \
+        __attribute__ ((format (printf, fmtarg_pos, vararg_pos) ))
+#endif
+
+
+OIIO_NAMESPACE_ENTER
+{
+
+
+class ArgOption;   // Forward declaration
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+///
+/// \class ArgParse
+///
+/// Argument Parsing
+///
+/// The parse function takes a list of options and variables or functions
+/// for storing option values and return <0 on failure:
+///
+/// \code
+///    static int
+///    parse_files (int argc, const char *argv[])
+///    {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list