Revision: 49511 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49511 Author: genscher Date: 2012-08-02 19:04:21 +0000 (Thu, 02 Aug 2012) Log Message: ----------- Windows x64 VC 2010: Unify lib folder again after discussion with Thomas Dinges.
- TODO: Adapt cmake + scons New design for now: ------------------------ lib -> win64 -> lib_name -> vc2010 / vc2008 -> lib / include Added Paths: ----------- trunk/lib/win64/openexr/vc2010/ trunk/lib/win64/openexr/vc2010/include/ trunk/lib/win64/openexr/vc2010/include/Iex/ trunk/lib/win64/openexr/vc2010/include/Iex/Iex.h trunk/lib/win64/openexr/vc2010/include/Iex/IexBaseExc.h trunk/lib/win64/openexr/vc2010/include/Iex/IexErrnoExc.h trunk/lib/win64/openexr/vc2010/include/Iex/IexMacros.h trunk/lib/win64/openexr/vc2010/include/Iex/IexMathExc.h trunk/lib/win64/openexr/vc2010/include/Iex/IexThrowErrnoExc.h trunk/lib/win64/openexr/vc2010/include/IlmBaseConfig.h trunk/lib/win64/openexr/vc2010/include/IlmThread/ trunk/lib/win64/openexr/vc2010/include/IlmThread/IlmThread.h trunk/lib/win64/openexr/vc2010/include/IlmThread/IlmThreadMutex.h trunk/lib/win64/openexr/vc2010/include/IlmThread/IlmThreadPool.h trunk/lib/win64/openexr/vc2010/include/IlmThread/IlmThreadSemaphore.h trunk/lib/win64/openexr/vc2010/include/Imath/ trunk/lib/win64/openexr/vc2010/include/Imath/ImathBox.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathBoxAlgo.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathColor.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathColorAlgo.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathEuler.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathExc.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathFrame.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathFrustum.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathFun.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathGL.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathGLU.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathHalfLimits.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathInt64.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathInterval.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathLimits.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathLine.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathLineAlgo.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathMath.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathMatrix.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathMatrixAlgo.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathPlane.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathPlatform.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathQuat.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathRandom.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathRoots.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathShear.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathSphere.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathVec.h trunk/lib/win64/openexr/vc2010/include/Imath/ImathVecAlgo.h trunk/lib/win64/openexr/vc2010/include/eLut.h trunk/lib/win64/openexr/vc2010/include/half.h trunk/lib/win64/openexr/vc2010/include/halfFunction.h trunk/lib/win64/openexr/vc2010/include/halfLimits.h trunk/lib/win64/openexr/vc2010/include/toFloat.h trunk/lib/win64/openexr/vc2010/lib/ trunk/lib/win64/openexr/vc2010/lib/Half.lib trunk/lib/win64/openexr/vc2010/lib/Half_d.lib trunk/lib/win64/openexr/vc2010/lib/Iex.lib trunk/lib/win64/openexr/vc2010/lib/Iex_d.lib trunk/lib/win64/openexr/vc2010/lib/IlmImf.lib trunk/lib/win64/openexr/vc2010/lib/IlmImf_d.lib trunk/lib/win64/openexr/vc2010/lib/IlmThread.lib trunk/lib/win64/openexr/vc2010/lib/IlmThread_d.lib trunk/lib/win64/openexr/vc2010/lib/Imath.lib trunk/lib/win64/openexr/vc2010/lib/Imath_d.lib trunk/lib/win64/openexr/vc2010/version_vc10.txt Removed Paths: ------------- trunk/lib/win64/openexr/include/vc_10/Iex/ trunk/lib/win64/openexr/include/vc_10/IlmBaseConfig.h trunk/lib/win64/openexr/include/vc_10/IlmThread/ trunk/lib/win64/openexr/include/vc_10/Imath/ trunk/lib/win64/openexr/include/vc_10/eLut.h trunk/lib/win64/openexr/include/vc_10/half.h trunk/lib/win64/openexr/include/vc_10/halfFunction.h trunk/lib/win64/openexr/include/vc_10/halfLimits.h trunk/lib/win64/openexr/include/vc_10/toFloat.h trunk/lib/win64/openexr/lib/vc_10/Half.lib trunk/lib/win64/openexr/lib/vc_10/Half_d.lib trunk/lib/win64/openexr/lib/vc_10/Iex.lib trunk/lib/win64/openexr/lib/vc_10/Iex_d.lib trunk/lib/win64/openexr/lib/vc_10/IlmImf.lib trunk/lib/win64/openexr/lib/vc_10/IlmImf_d.lib trunk/lib/win64/openexr/lib/vc_10/IlmThread.lib trunk/lib/win64/openexr/lib/vc_10/IlmThread_d.lib trunk/lib/win64/openexr/lib/vc_10/Imath.lib trunk/lib/win64/openexr/lib/vc_10/Imath_d.lib trunk/lib/win64/vc2010/openexr/ Deleted: trunk/lib/win64/openexr/include/vc_10/IlmBaseConfig.h =================================================================== --- trunk/lib/win64/openexr/include/vc_10/IlmBaseConfig.h 2012-08-02 18:55:00 UTC (rev 49510) +++ trunk/lib/win64/openexr/include/vc_10/IlmBaseConfig.h 2012-08-02 19:04:21 UTC (rev 49511) @@ -1,16 +0,0 @@ -// Hand-crafted version of config/IlmBaseConfig.h for Windows -// -// Define and set to 1 if the target system has POSIX thread support -// and you want IlmBase to use it for multithreaded file I/O. -// - -#undef HAVE_PTHREAD - -// -// Define and set to 1 if the target system supports POSIX semaphores -// and you want OpenEXR to use them; otherwise, OpenEXR will use its -// own semaphore implementation. -// - -#undef HAVE_POSIX_SEMAPHORES - Deleted: trunk/lib/win64/openexr/include/vc_10/eLut.h =================================================================== --- trunk/lib/win64/openexr/include/vc_10/eLut.h 2012-08-02 18:55:00 UTC (rev 49510) +++ trunk/lib/win64/openexr/include/vc_10/eLut.h 2012-08-02 19:04:21 UTC (rev 49511) @@ -1,71 +0,0 @@ -// -// This is an automatically generated file. -// Do not edit. -// - -{ - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1024, 2048, 3072, 4096, 5120, 6144, 7168, - 8192, 9216, 10240, 11264, 12288, 13312, 14336, 15360, - 16384, 17408, 18432, 19456, 20480, 21504, 22528, 23552, - 24576, 25600, 26624, 27648, 28672, 29696, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 33792, 34816, 35840, 36864, 37888, 38912, 39936, - 40960, 41984, 43008, 44032, 45056, 46080, 47104, 48128, - 49152, 50176, 51200, 52224, 53248, 54272, 55296, 56320, - 57344, 58368, 59392, 60416, 61440, 62464, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -}; Deleted: trunk/lib/win64/openexr/include/vc_10/half.h =================================================================== --- trunk/lib/win64/openexr/include/vc_10/half.h 2012-08-02 18:55:00 UTC (rev 49510) +++ trunk/lib/win64/openexr/include/vc_10/half.h 2012-08-02 19:04:21 UTC (rev 49511) @@ -1,766 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2002, Industrial Light & Magic, a division of Lucas -// Digital Ltd. LLC -// -// 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 Industrial Light & Magic 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. -// -/////////////////////////////////////////////////////////////////////////// - -// Primary authors: -// Florian Kainz <ka...@ilm.com> -// Rod Bogart <r...@ilm.com> - -//--------------------------------------------------------------------------- -// -// half -- a 16-bit floating point number class: -// -// Type half can represent positive and negative numbers whose -// magnitude is between roughly 6.1e-5 and 6.5e+4 with a relative -// error of 9.8e-4; numbers smaller than 6.1e-5 can be represented -// with an absolute error of 6.0e-8. All integers from -2048 to -// +2048 can be represented exactly. -// -// Type half behaves (almost) like the built-in C++ floating point -// types. In arithmetic expressions, half, float and double can be -// mixed freely. Here are a few examples: -// -// half a (3.5); -// float b (a + sqrt (a)); -// a += b; -// b += a; -// b = a + 7; -// -// Conversions from half to float are lossless; all half numbers -// are exactly representable as floats. -// -// Conversions from float to half may not preserve a float's value -// exactly. If a float is not representable as a half, then the -// float value is rounded to the nearest representable half. If a -// float value is exactly in the middle between the two closest -// representable half values, then the float value is rounded to -// the closest half whose least significant bit is zero. -// -// Overflows during float-to-half conversions cause arithmetic -// exceptions. An overflow occurs when the float value to be -// converted is too large to be represented as a half, or if the -// float value is an infinity or a NAN. -// -// The implementation of type half makes the following assumptions -// about the implementation of the built-in C++ types: -// -// float is an IEEE 754 single-precision number -// sizeof (float) == 4 -// sizeof (unsigned int) == sizeof (float) -// alignof (unsigned int) == alignof (float) -// sizeof (unsigned short) == 2 -// -//--------------------------------------------------------------------------- - -#ifndef _HALF_H_ -#define _HALF_H_ - -#include <iostream> - -#if defined(OPENEXR_DLL) - #if defined(HALF_EXPORTS) - #define HALF_EXPORT __declspec(dllexport) - #else - #define HALF_EXPORT __declspec(dllimport) - #endif - #define HALF_EXPORT_CONST -#else - #define HALF_EXPORT - #define HALF_EXPORT_CONST const -#endif - -class HALF_EXPORT half -{ - public: - - //------------- - // Constructors - //------------- - - half (); // no initialization - half (float f); - - - //-------------------- - // Conversion to float - //-------------------- - - operator float () const; - - - //------------ - // Unary minus - //------------ - - half operator - () const; - - - //----------- - // Assignment - //----------- - - half & operator = (half h); - half & operator = (float f); - - half & operator += (half h); - half & operator += (float f); - - half & operator -= (half h); - half & operator -= (float f); - - half & operator *= (half h); - half & operator *= (float f); - - half & operator /= (half h); - half & operator /= (float f); - - @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs