[Hdrflow-svn] SF.net SVN: hdrflow: [140] trunk/lib/extras

[<gl...@us...>]

Revision: 140
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=140&view=rev
Author:   glslang
Date:     2007-05-23 13:50:56 -0700 (Wed, 23 May 2007)

Log Message:
-----------
+ compilation fixes
+ virtual address space of 3GB on win

Modified Paths:
--------------
    trunk/lib/extras/extras_vc8.sln
    trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
    trunk/lib/extras/src/raw/dcraw_vc8.vcproj
    trunk/lib/extras/src/raw/raw_vc8.vcproj

Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln	2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/extras_vc8.sln	2007-05-23 20:50:56 UTC (rev 140)
@@ -18,36 +18,22 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
 		Multi-threaded Release DLL|Win32 = Multi-threaded Release DLL|Win32
-		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{008BA3EE-35D6-432D-96B6-F65707CCCFBF}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
 		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
-		{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj	2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj	2007-05-23 20:50:56 UTC (rev 140)
@@ -64,6 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\hdrflow_panoramic-vc80-d-0_1_0.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
@@ -145,6 +146,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\hdrflow_panoramic-vc80-r-0_1_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"

Modified: trunk/lib/extras/src/raw/dcraw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/dcraw_vc8.vcproj	2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/src/raw/dcraw_vc8.vcproj	2007-05-23 20:50:56 UTC (rev 140)
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libjpeg.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;C:\Program Files\HDR\lib&quot;"
@@ -143,6 +144,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				AdditionalDependencies="libjpeg.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;C:\Program Files\HDR\lib&quot;"

Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj	2007-05-23 20:40:55 UTC (rev 139)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj	2007-05-23 20:50:56 UTC (rev 140)
@@ -64,9 +64,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\hdrflow_raw-vc80-d-0_1_0.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -145,9 +146,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/LARGEADDRESSAWARE"
 				OutputFile="$(OutDir)\hdrflow_raw-vc80-r-0_1_0.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="C:\Boost\lib;&quot;$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)&quot;;&quot;$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"


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