[Hdrflow-svn] SF.net SVN: hdrflow: [317] trunk/lib/openlibraries

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 317
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=317&view=rev
Author:   glslang
Date:     2007-09-28 15:27:52 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
+ update to OpenEXR 1.6.0

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
    trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
    trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj

Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================

--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi	2007-09-27 19:15:01 UTC (rev 316)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi	2007-09-28 22:27:52 UTC (rev 317)
@@ -90,14 +90,15 @@
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
   File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll"
+  File "C:\OpenEXR\bin\Release\Half.dll"
+  File "C:\OpenEXR\bin\Release\Iex.dll"
+  File "C:\OpenEXR\bin\Release\IlmImf.dll"
+  File "C:\OpenEXR\bin\Release\Half.dll"
+  File "C:\OpenEXR\bin\Release\IlmThread.dll"
+  File "C:\OpenEXR\bin\Release\Imath.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
+  File "C:\zlib\lib\zlib1.dll"
 
   ; Python
   SetOutPath $INSTDIR\python
@@ -167,7 +168,8 @@
 
   Push "$INSTDIR\bin"
   Call AddToPath
-
+  Push "$INSTDIR\bin\Release"
+  Call AddToPath
 ;--------------------------------
 ;Python environment variable
   Push "PYTHONPATH"
@@ -215,6 +217,9 @@
   Push "$INSTDIR\bin"
   Call un.RemoveFromPath
 
+  Push "$INSTDIR\bin\Release"
+  Call un.RemoveFromPath
+
   Push "PYTHONPATH"
   Call un.DeleteEnvStr
 

Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2007-09-27 19:15:01 UTC (rev 316)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2007-09-28 22:27:52 UTC (rev 317)
@@ -185,20 +185,15 @@
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
   File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Half_dll_d.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll_d.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Iex_dll_d.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Imath_dll_d.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\zlib1d.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll_d.dll"
-  File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.dll"
+  File "C:\OpenEXR\bin\Debug\Half.dll"
+  File "C:\OpenEXR\bin\Debug\Iex.dll"
+  File "C:\OpenEXR\bin\Debug\IlmImf.dll"
+  File "C:\OpenEXR\bin\Debug\Half.dll"
+  File "C:\OpenEXR\bin\Debug\IlmThread.dll"
+  File "C:\OpenEXR\bin\Debug\Imath.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
   File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
+  File "C:\zlib\lib\zlib1.dll"
 
   ; Python
   SetOutPath $INSTDIR\python
@@ -316,6 +311,8 @@
 
   Push "$INSTDIR\bin"
   Call AddToPath
+  Push "$INSTDIR\bin\Debug"
+  Call AddToPath
 
 ;--------------------------------
 ;Include environment variable
@@ -367,8 +364,6 @@
 
 Section Uninstall
 
-  ;ExecWait 'regsvr32 GetAudio.ax -u'
-
   SetDetailsPrint textonly
   DetailPrint "Deleting Files..."
   SetDetailsPrint listonly
@@ -379,6 +374,9 @@
   Push "$INSTDIR\bin"
   Call un.RemoveFromPath
 
+  Push "$INSTDIR\bin\Debug"
+  Call un.RemoveFromPath
+
   Push "OPENLIBRARIES_LIB_PATH"
   Call un.DeleteEnvStr
 

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj	2007-09-27 19:15:01 UTC (rev 316)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj	2007-09-28 22:27:52 UTC (rev 317)
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;&quot;C:\openexr-1.4.0-vs2005\include\OpenEXR&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;&quot;C:\OpenEXR\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -67,10 +67,10 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="/LARGEADDRESSAWARE"
-				AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
+				AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
 				OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_4_0.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;C:\openexr-1.4.0-vs2005\lib&quot;"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;C:\OpenEXR\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;&quot;C:\openexr-1.4.0-vs2005\include\OpenEXR&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src&quot;;&quot;C:\Boost\include\boost-1_34_1&quot;;C:\OpenEXR\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
@@ -151,10 +151,10 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="/LARGEADDRESSAWARE"
-				AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
+				AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
 				OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_4_0.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;C:\openexr-1.4.0-vs2005\lib&quot;"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)&quot;;C:\OpenEXR\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


