[svn-r17162] Added H5FA* files to the hdf5 and hdf5dll projects. (r17160 from trunk)

Tested: windows

4 files changed, 282 insertions, 202 deletions

diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj
index 37fe50d..53717f7 100644
--- a/windows/proj/hdf5/hdf5.vcproj
+++ b/windows/proj/hdf5/hdf5.vcproj
@@ -786,48 +786,6 @@
 					/>

 				</FileConfiguration>

 			</File>

-			<File
-				RelativePath="..\..\..\src\H5Bdbg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File

 				RelativePath="..\..\..\src\H5B2dbg.c"

 				>

@@ -1039,6 +997,48 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5Bdbg.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions=""

+						BrowseInformation="1"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions=""

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5C.c"

 				>

 				<FileConfiguration

@@ -1215,11 +1215,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dchunk.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\H5Dcompact.c"

+				RelativePath="..\..\..\src\H5Dbtree.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1265,7 +1261,11 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dcontig.c"

+				RelativePath="..\..\..\src\H5Dchunk.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Dcompact.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1311,11 +1311,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Ddbg.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\H5Ddeprec.c"

+				RelativePath="..\..\..\src\H5Dcontig.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1324,6 +1320,8 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions=""

+						ObjectFile="..\..\..\proj\hdf5\Debug/"

+						ProgramDataBaseFileName="..\..\..\proj\hdf5\Debug/"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

@@ -1334,6 +1332,8 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions=""

+						ObjectFile="..\..\..\proj\hdf5\Debug/"

+						ProgramDataBaseFileName="..\..\..\proj\hdf5\Debug/"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

@@ -1357,7 +1357,11 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Defl.c"

+				RelativePath="..\..\..\src\H5Ddbg.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Ddeprec.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1366,8 +1370,6 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions=""

-						ObjectFile="..\..\..\proj\hdf5\Debug/"

-						ProgramDataBaseFileName="..\..\..\proj\hdf5\Debug/"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

@@ -1378,8 +1380,6 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions=""

-						ObjectFile="..\..\..\proj\hdf5\Debug/"

-						ProgramDataBaseFileName="..\..\..\proj\hdf5\Debug/"

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

@@ -1403,15 +1403,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dfill.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\H5Dint.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\H5Dio.c"

+				RelativePath="..\..\..\src\H5Defl.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1457,7 +1449,15 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dbtree.c"

+				RelativePath="..\..\..\src\H5Dfill.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Dint.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Dio.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1907,10 +1907,42 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5FA.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAcache.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Faccum.c"

 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5FAdbg.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAdblkpage.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAdblock.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAhdr.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAstat.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAtest.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5FD.c"

 				>

 				<FileConfiguration

@@ -9299,6 +9331,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5FApkg.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAprivate.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5FDpkg.h"

 				>

 			</File>

diff --git a/windows/proj/hdf5_fortran/hdf5_fortran.vfproj b/windows/proj/hdf5_fortran/hdf5_fortran.vfproj
index 9dd53e0..79ac983 100644
--- a/windows/proj/hdf5_fortran/hdf5_fortran.vfproj
+++ b/windows/proj/hdf5_fortran/hdf5_fortran.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

 		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFLibrarianTool" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="static /threads" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

 				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeStaticLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebug" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/>

+				<Tool Name="VFPreLinkEventTool"/>

 				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

+				<Tool Name="VFLibrarianTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\$(ProjectName)d.lib" SuppressStartupBanner="true" LinkLibraryDependencies="true"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\fortran\src\H5_DBLE_InterfaceInclude.f90"/>

diff --git a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
index 89939d2..5af512a 100644
--- a/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
+++ b/windows/proj/hdf5_fortrandll/hdf5_fortrandll.vfproj
@@ -7,39 +7,39 @@
 		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

-				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFLinkerTool" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="midlTargetWin32" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFPostBuildEventTool"/>

+				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

-				<Tool Name="VFPreLinkEventTool"/></Configuration>

+				<Tool Name="VFPreLinkEventTool"/>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

 		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="Debug/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" FPS4Symbols="true" WarnArgMismatch="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortranddll.dll" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration>

 		<Configuration Name="Release|x64" OutputDirectory="..\..\..\proj\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" ConfigurationType="typeDynamicLibrary" MustRebuild="true" Command="$(TargetPath)">

 				<Tool Name="VFMidlTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TypeLibraryName="$(OUTDIR)/hdf5_fortrandll.tlb"/>

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="Release/" PreprocessorDefinitions="HDF5F90_WINDOWS,BUILD_HDF5_DLL" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" CompileOnly="true"/>

+				<Tool Name="VFPostBuildEventTool"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OutDir)\hdf5_fortrandll.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="..\..\..\fortran\src\hdf5_fortrandll.def" SubSystem="subSystemWindows" ImportLibrary="$(TargetDir)$(TargetName).lib" LinkDLL="true" AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>

-				<Tool Name="VFPreLinkEventTool"/>

-				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

+				<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>

 	<Files>

 		<Filter Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp">

 		<File RelativePath="..\..\..\fortran\src\H5_DBLE_InterfaceInclude.f90"/>

diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj
index 9250767..fe0b1aa 100644
--- a/windows/proj/hdf5dll/hdf5dll.vcproj
+++ b/windows/proj/hdf5dll/hdf5dll.vcproj
@@ -871,88 +871,8 @@
 					/>

 				</FileConfiguration>

 			</File>

-			<File
-				RelativePath="..\..\..\src\H5Bdbg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\src\H5B2dbg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"
-					/>
-				</FileConfiguration>
-			</File>
 			<File

-				RelativePath="..\..\..\src\H5B2int.c"

+				RelativePath="..\..\..\src\H5B2dbg.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -992,7 +912,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5B2stat.c"

+				RelativePath="..\..\..\src\H5B2int.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1032,7 +952,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5B2test.c"

+				RelativePath="..\..\..\src\H5B2stat.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1072,7 +992,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Bcache.c"

+				RelativePath="..\..\..\src\H5B2test.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1112,7 +1032,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5C.c"

+				RelativePath="..\..\..\src\H5Bcache.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1121,8 +1041,6 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

-						ObjectFile="../../../proj/hdf5dll/Debug/"

-						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1132,8 +1050,6 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

-						ObjectFile="../../../proj/hdf5dll/Debug/"

-						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1143,8 +1059,6 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

-						ObjectFile="../../../proj/hdf5dll/Release/"

-						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1154,13 +1068,11 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

-						ObjectFile="../../../proj/hdf5dll/Release/"

-						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5checksum.c"

+				RelativePath="..\..\..\src\H5Bdbg.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1200,7 +1112,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5D.c"

+				RelativePath="..\..\..\src\H5C.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1248,7 +1160,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5dbg.c"

+				RelativePath="..\..\..\src\H5checksum.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1288,11 +1200,7 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dchunk.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\H5Dcompact.c"

+				RelativePath="..\..\..\src\H5D.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1340,7 +1248,47 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dcontig.c"

+				RelativePath="..\..\..\src\H5dbg.c"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Dbtree.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1388,11 +1336,11 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Ddbg.c"

+				RelativePath="..\..\..\src\H5Dchunk.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Ddeprec.c"

+				RelativePath="..\..\..\src\H5Dcompact.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1401,6 +1349,8 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						ObjectFile="../../../proj/hdf5dll/Debug/"

+						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1410,6 +1360,8 @@
 						Name="VCCLCompilerTool"

 						Optimization="0"

 						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						ObjectFile="../../../proj/hdf5dll/Debug/"

+						ProgramDataBaseFileName="../../../proj/hdf5dll/Debug/"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1419,6 +1371,8 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						ObjectFile="../../../proj/hdf5dll/Release/"

+						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1428,11 +1382,13 @@
 						Name="VCCLCompilerTool"

 						Optimization="2"

 						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+						ObjectFile="../../../proj/hdf5dll/Release/"

+						ProgramDataBaseFileName="../../../proj/hdf5dll/Release/"

 					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Defl.c"

+				RelativePath="..\..\..\src\H5Dcontig.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1480,15 +1436,51 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dfill.c"

+				RelativePath="..\..\..\src\H5Ddbg.c"

 				>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dint.c"

+				RelativePath="..\..\..\src\H5Ddeprec.c"

 				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="0"

+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						Optimization="2"

+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5DLL_;ZLIB_DLL;_SZDLL_"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dio.c"

+				RelativePath="..\..\..\src\H5Defl.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1536,7 +1528,15 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\..\src\H5Dbtree.c"

+				RelativePath="..\..\..\src\H5Dfill.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Dint.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5Dio.c"

 				>

 				<FileConfiguration

 					Name="Debug|Win32"

@@ -1992,10 +1992,42 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5FA.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAcache.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5Faccum.c"

 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5FAdbg.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAdblkpage.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAdblock.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAhdr.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAstat.c"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAtest.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5FD.c"

 				>

 				<FileConfiguration

@@ -9397,6 +9429,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\H5FApkg.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\src\H5FAprivate.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\H5FDpkg.h"

 				>

 			</File>