[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52212] trunk/lib/windows: Windows lib: update openimageio to 1.1 and add OSL build instructions.
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Nov 14 19:13:38 CET 2012
Revision: 52212
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52212
Author: blendix
Date: 2012-11-14 18:13:37 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Windows lib: update openimageio to 1.1 and add OSL build instructions.
Unfortunately OSL is still crashing when I use it here, suspect some sort of
runtime library conflict but as far as I can tell everything is compiled with
/MT flags. So no OSL libraries committed yet.
Modified Paths:
--------------
trunk/lib/windows/boost/build.bat
trunk/lib/windows/boost/readme.txt
trunk/lib/windows/llvm/build.bat
trunk/lib/windows/openimageio/bin/OpenImageIO.dll
trunk/lib/windows/openimageio/build.bat
trunk/lib/windows/openimageio/build.patch
trunk/lib/windows/openimageio/include/OpenImageIO/argparse.h
trunk/lib/windows/openimageio/include/OpenImageIO/color.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/paramlist.h
trunk/lib/windows/openimageio/include/OpenImageIO/plugin.h
trunk/lib/windows/openimageio/include/OpenImageIO/pugiconfig.hpp
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/version.h
trunk/lib/windows/openimageio/lib/OpenImageIO.lib
trunk/lib/windows/openimageio/readme.txt
Added Paths:
-----------
trunk/lib/windows/osl/
trunk/lib/windows/osl/build.bat
trunk/lib/windows/osl/flex_bison/
trunk/lib/windows/osl/flex_bison/bin/
trunk/lib/windows/osl/flex_bison/bin/data/
trunk/lib/windows/osl/flex_bison/bin/data/bison.m4
trunk/lib/windows/osl/flex_bison/bin/data/m4sugar/
trunk/lib/windows/osl/flex_bison/bin/data/m4sugar/foreach.m4
trunk/lib/windows/osl/flex_bison/bin/data/m4sugar/m4sugar.m4
trunk/lib/windows/osl/flex_bison/bin/data/yacc.c
trunk/lib/windows/osl/flex_bison/bin/win_bison.exe
trunk/lib/windows/osl/flex_bison/bin/win_flex.exe
trunk/lib/windows/osl/flex_bison/include/
trunk/lib/windows/osl/flex_bison/include/FlexLexer.h
trunk/lib/windows/osl/readme.txt
Modified: trunk/lib/windows/boost/build.bat
===================================================================
--- trunk/lib/windows/boost/build.bat 2012-11-14 17:18:47 UTC (rev 52211)
+++ trunk/lib/windows/boost/build.bat 2012-11-14 18:13:37 UTC (rev 52212)
@@ -1,9 +1,11 @@
@echo off
+cd boost_1_49_0
+
:: build
call bootstrap.bat
-bjam -j4 variant=release link=static runtime-link=static threading=multi --with-filesystem --with-locale --with-thread --with-regex --with-system --with-date_time stage
-bjam -j4 variant=debug link=static runtime-link=static threading=multi --with-filesystem --with-locale --with-thread --with-regex --with-system --with-date_time stage
+bjam -j4 variant=release link=static runtime-link=static threading=multi --with-filesystem --with-locale --with-thread --with-regex --with-system --with-date_time --with-wave stage
+bjam -j4 variant=debug link=static runtime-link=static threading=multi --with-filesystem --with-locale --with-thread --with-regex --with-system --with-date_time --with-wave stage
:: copy files
mkdir ..\lib
@@ -11,4 +13,5 @@
xcopy /E /Y stage\lib ..\lib
xcopy /E /Y boost ..\include\boost
+cd..
Modified: trunk/lib/windows/boost/readme.txt
===================================================================
--- trunk/lib/windows/boost/readme.txt 2012-11-14 17:18:47 UTC (rev 52211)
+++ trunk/lib/windows/boost/readme.txt 2012-11-14 18:13:37 UTC (rev 52212)
@@ -2,7 +2,7 @@
Build Info
* Download Boost 1.49
-* Extracted in lib/windows/boost
+* Extracted in lib/windows/boost/boost_1_49
* Open Visual Studio 2008 Command Prompt
-* cd into lib/windows/boost/boost_1_49
-* ..\build.bat
+* cd into lib/windows/boost
+* build.bat
Modified: trunk/lib/windows/llvm/build.bat
===================================================================
--- trunk/lib/windows/llvm/build.bat 2012-11-14 17:18:47 UTC (rev 52211)
+++ trunk/lib/windows/llvm/build.bat 2012-11-14 18:13:37 UTC (rev 52212)
@@ -15,8 +15,8 @@
-DLLVM_INCLUDE_TESTS=OFF ^
-DLLVM_INCLUDE_EXAMPLES=OFF
-nmake -j2
-nmake install
+::nmake
+::nmake install
cd ..\..
@@ -27,11 +27,11 @@
cmake -G "NMake Makefiles" ..\.. ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\llvm\debug ^
-DCMAKE_BUILD_TYPE=Debug ^
- -DLLVM_USE_CRT_RELEASE=MTd ^
+ -DLLVM_USE_CRT_DEBUG=MTd ^
-DLLVM_INCLUDE_TESTS=OFF ^
-DLLVM_INCLUDE_EXAMPLES=OFF
-nmake -j2
+nmake
nmake install
cd ..\..\..
Modified: trunk/lib/windows/openimageio/bin/OpenImageIO.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows/openimageio/build.bat
===================================================================
--- trunk/lib/windows/openimageio/build.bat 2012-11-14 17:18:47 UTC (rev 52211)
+++ trunk/lib/windows/openimageio/build.bat 2012-11-14 18:13:37 UTC (rev 52212)
@@ -1,5 +1,7 @@
@Echo off
+cd oiio
+
set LIBDIR=%CD%\..\..
:: hack to get compatible EXR headers
@@ -19,7 +21,7 @@
cd build\windows
cmake -G "NMake Makefiles" ..\..\src ^
- -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio\release ^
+ -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 ^
@@ -84,5 +86,5 @@
nmake
nmake install
-cd ..\..
+cd ..\..\..
Modified: trunk/lib/windows/openimageio/build.patch
===================================================================
--- trunk/lib/windows/openimageio/build.patch 2012-11-14 17:18:47 UTC (rev 52211)
+++ trunk/lib/windows/openimageio/build.patch 2012-11-14 18:13:37 UTC (rev 52212)
@@ -1,24 +1,27 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f322e83..fdc1f70 100644
+index 6f872b9..8f12a06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -116,20 +116,30 @@ if (MSVC)
+@@ -226,6 +226,18 @@ 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_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")
+
-+ 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)
+@@ -238,14 +250,6 @@ include (CTest)
# Tell CMake to process the sub-directories
add_subdirectory (libOpenImageIO)
@@ -26,90 +29,70 @@
-add_subdirectory (idiff)
-add_subdirectory (igrep)
-add_subdirectory (iinfo)
--add_subdirectory (iprocess)
-add_subdirectory (maketx)
+-add_subdirectory (oiiotool)
-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)
-@@ -167,41 +177,41 @@ add_subdirectory (doc)
- # Testing
+ add_subdirectory (bmp.imageio)
+@@ -307,55 +311,6 @@ if (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS 2.8)
+ DESTINATION ${CMAKE_BINARY_DIR})
+ endif()
- # List all the individual testsuite tests here:
--oiio_add_tests (ico gpsread sgi
-- texture-fill texture-gray texture-grid
-- texture-missing texture-pointsample texture-res
+-# List all the individual testsuite tests here:
+-oiio_add_tests (ico gpsread misnamed-file nonwhole-tiles
+- oiiotool oiiotool-composite oiiotool-fixnan
+- perchannel
+- sgi rla psd dpx png
+- texture-blurtube texture-fill texture-filtersize
+- texture-gray texture-grid
+- texture-missing texture-overscan
+- texture-pointsample texture-width0blur texture-res
- texture-skinny texture-fat
-- imagecache-files texture-field3d)
-+#oiio_add_tests (ico gpsread sgi
-+# texture-fill texture-gray texture-grid
-+# texture-missing texture-pointsample texture-res
-+# texture-skinny texture-fat
-+# imagecache-files texture-field3d)
-
- # List testsuites which need special external reference images from the web
- # here:
+- )
+-
+-
+-# List testsuites which need special external reference images from the web
+-# here:
-oiio_add_tests (bmp
- IMAGEDIR bmpsuite
- URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-+#oiio_add_tests (bmp
-+# IMAGEDIR bmpsuite
-+# URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
-
+-
-oiio_add_tests (tiff-suite tiff-depths
- IMAGEDIR libtiffpic
- URL http://www.remotesensing.org/libtiff/images.html)
-+#oiio_add_tests (tiff-suite tiff-depths
-+# IMAGEDIR libtiffpic
-+# URL http://www.remotesensing.org/libtiff/images.html)
-
--oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-- IMAGEDIR openexr-images-1.5.0
+-
+-oiio_add_tests (openexr-suite openexr-multires openexr-chroma openexr-v2
+- IMAGEDIR openexr-images
- URL http://www.openexr.com/downloads.html)
-+#oiio_add_tests (openexr-suite openexr-multires openexr-chroma
-+# IMAGEDIR openexr-images-1.5.0
-+# URL http://www.openexr.com/downloads.html)
-
+-
-oiio_add_tests (jpeg2000
+- FOUNDVAR OPENJPEG_FOUND
- IMAGEDIR j2kp4files_v1_5
-- URL http://www.crc.ricoh.com/~gormish/jpeg2000conformance/)
-+#oiio_add_tests (jpeg2000
-+# IMAGEDIR j2kp4files_v1_5
-+# URL http://www.crc.ricoh.com/~gormish/jpeg2000conformance/)
-
+- URL http://www.itu.int/net/ITU-T/sigdb/speimage/ImageForm-s.aspx?val=10100803)
+-
-oiio_add_tests (targa-tgautils
- IMAGEDIR TGAUTILS
- URL http://tgautils.inequation.org/)
-+#oiio_add_tests (targa-tgautils
-+# IMAGEDIR TGAUTILS
-+# URL http://tgautils.inequation.org/)
-
+-
-oiio_add_tests (fits
- IMAGEDIR fits-images
- URL http://www.cv.nrao.edu/fits/data/tests/)
-+#oiio_add_tests (fits
-+# IMAGEDIR fits-images
-+# URL http://www.cv.nrao.edu/fits/data/tests/)
-
+-
-oiio_add_tests (webp
+- FOUNDVAR WEBP_FOUND
- IMAGEDIR webp-images
- URL http://code.google.com/speed/webp/gallery.html)
-+#oiio_add_tests (webp
-+# IMAGEDIR webp-images
-+# URL http://code.google.com/speed/webp/gallery.html)
-
+-
+-oiio_add_tests (texture-field3d
+- FOUNDVAR FIELD3D_FOUND)
+-
+-
#########################################################################
# Packaging
-@@ -234,7 +244,7 @@ if (WIN32)
+ set (CPACK_PACKAGE_VERSION_MAJOR ${OIIO_VERSION_MAJOR})
+@@ -387,7 +342,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)
@@ -118,11 +101,30 @@
include (InstallRequiredSystemLibraries)
endif ()
set (CPACK_SOURCE_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-source)
+diff --git a/src/include/fmath.h b/src/include/fmath.h
+index 45067f9..084c032 100644
+--- a/src/include/fmath.h
++++ b/src/include/fmath.h
+@@ -48,10 +48,10 @@
+ #include <algorithm>
+
+ #if defined(_MSC_VER) && _MSC_VER < 1600
+- typedef __int8 int8_t;
+- typedef __int16 int16_t;
+- typedef __int32 int32_t;
+- typedef __int64 int64_t;
++ typedef signed __int8 int8_t;
++ typedef signed __int16 int16_t;
++ typedef signed __int32 int32_t;
++ typedef signed __int64 int64_t;
+ typedef unsigned __int8 uint8_t;
+ typedef unsigned __int16 uint16_t;
+ # ifndef _UINT64_T
diff --git a/src/include/thread.h b/src/include/thread.h
-index 2303c3e..4ced852 100644
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list