[svn-r15126] Purpose: Cleanup unneeded Windows source

Description:
Previously, we maintained some source files that are commonly generated dynamically on other systems.  Now, we also generate them on Windows as well.  We should remove them from the repository so old versions are not accidentally used.

Also, clean up the project files to organize generator programs.

Tested:
VS2005 on WinXP
VS2005 on WinXP x64
VS.NET on WinXP

9 files changed, 66 insertions, 714 deletions

diff --git a/MANIFEST b/MANIFEST
index e00cc34..07ec5f0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1802,10 +1802,6 @@
 ./windows/fortran/examples/selecteletest/selecteletest.vfproj
 ./windows/fortran/examples/selecteletestdll/selecteletestdll.vfproj
 
-# Windows-maintained Fortran Source
-./windows/fortran/src/H5f90i_gen.h
-./windows/fortran/src/H5fortran_types.f90
-
 # Fortran Tests
 ./windows/fortran/test/checkfortrantests.bat
 ./windows/fortran/test/flush1_fortran/flush1_fortran.vfproj
@@ -1943,7 +1939,6 @@
 
 # Windows-maintainted Source
 ./windows/src/H5pubconf.h
-./windows/src/H5Tinit.c
 
 # Library Test Projects
 ./windows/test/checktests.bat
diff --git a/windows/fortran/src/H5f90i_gen.h b/windows/fortran/src/H5f90i_gen.h
deleted file mode 100755
index 761ae4e..0000000
--- a/windows/fortran/src/H5f90i_gen.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-#ifndef _H5f90i_gen_H
-#define _H5f90i_gen_H
-
-/* This file is automatically generated by H5match_types.c at build time. */
-
-#include "H5public.h"
-
-#define c_int_1 char
-#define c_int_2 short
-#define c_int_4 long
-#define c_int_8 long_long
-#define c_float_4 float
-#define c_double_8 long double
-
-typedef c_int_8 haddr_t_f;
-typedef c_int_8 hsize_t_f;
-typedef c_int_8 hssize_t_f;
-typedef c_int_4 size_t_f;
-typedef c_int_4 int_f;
-typedef c_int_4 hid_t_f;
-typedef c_float_4 real_f;
-typedef c_double_8 double_f;
-
-#endif /* _H5f90i_gen_H */
diff --git a/windows/fortran/src/H5fortran_types.f90 b/windows/fortran/src/H5fortran_types.f90
deleted file mode 100755
index 08352df..0000000
--- a/windows/fortran/src/H5fortran_types.f90
+++ /dev/null
@@ -1,34 +0,0 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
-!   Copyright by The HDF Group.                                               *
-!   Copyright by the Board of Trustees of the University of Illinois.         *
-!   All rights reserved.                                                      *
-!                                                                             *
-!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
-!   terms governing use, modification, and redistribution, is contained in    *
-!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
-!   of the source code distribution tree; Copyright.html can be found at the  *
-!   root level of an installed copy of the electronic HDF5 document set and   *
-!   is linked from the top-level documents page.  It can also be found at     *
-!   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-!   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-!
-!
-! This file is automatically generated and contains HDF5 Fortran90 type definitions.
-!
-       MODULE H5FORTRAN_TYPES
-         !
-         !  HDF5 integers
-         !
-        INTEGER, PARAMETER :: HADDR_T = 8
-        INTEGER, PARAMETER :: HSIZE_T = 8
-        INTEGER, PARAMETER :: HSSIZE_T = 8
-        INTEGER, PARAMETER :: SIZE_T = 4
-        INTEGER, PARAMETER :: Fortran_INTEGER = 4
-        INTEGER, PARAMETER :: HID_T = 4
-        INTEGER, PARAMETER :: Fortran_REAL = 4
-        INTEGER, PARAMETER :: Fortran_DOUBLE = 8
-
-        INTEGER(SIZE_T), PARAMETER :: OBJECT_NAMELEN_DEFAULT_F = -1
-
-        END MODULE H5FORTRAN_TYPES
diff --git a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
index 2fc488c..8fe1005 100644
--- a/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
+++ b/windows/misc/typegen/h5fort_type_defines/h5fort_type_defines.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

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

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

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

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" 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>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFPreLinkEventTool"/>

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

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

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

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

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

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" 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="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

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

-		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFPreLinkEventTool"/>

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

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

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

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

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

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" 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|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

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

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

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

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

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

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

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fort_type_defines.h" Description="Generating H5fort_type_defines.h"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/H5fortran_detect.pdb" SubSystem="subSystemConsole" 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="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration></Configurations>

+				<Tool Name="VFResourceCompilerTool" 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\H5fortran_detect.f90"/></Filter>

diff --git a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
index 5dbe52f..72f97f5 100644
--- a/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
+++ b/windows/misc/typegen/h5fortran_detect/h5fortran_detect.vfproj
@@ -4,42 +4,42 @@
 		<Platform Name="Win32"/>

 		<Platform Name="x64"/></Platforms>

 	<Configurations>

-		<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

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

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

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

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

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" 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="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/>

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

-		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)">

+				<Tool Name="VFPreLinkEventTool"/>

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

+		<Configuration Name="Debug|Win32" OutputDirectory="..\..\..\..\fortran\src\$(ProjectName)\$(ConfigurationName)" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

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

 				<Tool Name="VFPreBuildEventTool"/>

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

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

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" 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>

-		<Configuration Name="Release|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

+				<Tool Name="VFPreLinkEventTool"/>

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

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

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

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

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

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" 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="NDEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>

-		<Configuration Name="Debug|x64" OutputDirectory="..\..\..\..\fortran\src" IntermediateDirectory="$(OutDir)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true">

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

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

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

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

 				<Tool Name="VFPreBuildEventTool"/>

-				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

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

+				<Tool Name="VFPostBuildEventTool" CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5fortran_detect.f90" Description="Generating H5fortran_detect.f90"/>

 				<Tool Name="VFCustomBuildTool"/>

 				<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" LinkIncremental="linkIncrementalYes" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/h5fortran_detect.pdb" SubSystem="subSystemConsole" 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></Configurations>

+				<Tool Name="VFResourceCompilerTool" PreprocessorDefinitions="_DEBUG" 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\H5test_kind.f90"/></Filter>

diff --git a/windows/misc/typegen/h5match_types/h5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj
index b9415a4..0b751ca 100644
--- a/windows/misc/typegen/h5match_types/h5match_types.vcproj
+++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj
@@ -19,7 +19,7 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\fortran\src"

+			OutputDirectory="..\..\..\..\fortran\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -106,12 +106,12 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5f90i_gen.h and H5fortran_types.f90"

-				CommandLine="$(TargetPath)"

+				CommandLine="cd $(TargetDir)..\.. &amp;&amp; $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\fortran\src"

+			OutputDirectory="..\..\..\..\fortran\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -199,12 +199,12 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5f90i_gen.h and H5fortran_types.f90"

-				CommandLine="$(TargetPath)"

+				CommandLine="cd $(TargetDir)..\.. &amp;&amp; $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\fortran\src"

+			OutputDirectory="..\..\..\..\fortran\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -290,12 +290,12 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5f90i_gen.h and H5fortran_types.f90"

-				CommandLine="$(TargetPath)"

+				CommandLine="cd $(TargetDir)..\.. &amp;&amp; $(TargetPath)"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="..\..\..\..\fortran\src"

+			OutputDirectory="..\..\..\..\fortran\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -382,7 +382,7 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5f90i_gen.h and H5fortran_types.f90"

-				CommandLine="$(TargetPath)"

+				CommandLine="cd $(TargetDir)..\.. &amp;&amp; $(TargetPath)"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/windows/misc/typegen/h5tinit/h5tinit.vcproj b/windows/misc/typegen/h5tinit/h5tinit.vcproj
index db8f012..0075e16 100644
--- a/windows/misc/typegen/h5tinit/h5tinit.vcproj
+++ b/windows/misc/typegen/h5tinit/h5tinit.vcproj
@@ -19,7 +19,7 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\src"

+			OutputDirectory="..\..\..\..\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -105,12 +105,12 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5tinit.c"

-				CommandLine="$(TargetPath) &gt;$(TargetDir)H5tinit.c"

+				CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5tinit.c"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="..\..\..\..\src"

+			OutputDirectory="..\..\..\..\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -197,12 +197,12 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5tinit.c"

-				CommandLine="$(TargetPath) &gt;$(TargetDir)H5tinit.c"

+				CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5tinit.c"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\src"

+			OutputDirectory="..\..\..\..\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -288,12 +288,12 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5tinit.c"

-				CommandLine="$(TargetPath) &gt;$(TargetDir)H5tinit.c"

+				CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5tinit.c"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

-			OutputDirectory="..\..\..\..\src"

+			OutputDirectory="..\..\..\..\src\$(ProjectName)\$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\..\proj\property_sheets\remove-posix-warnings.vsprops"

@@ -380,7 +380,7 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5tinit.c"

-				CommandLine="$(TargetPath) &gt;$(TargetDir)H5tinit.c"

+				CommandLine="$(TargetPath) &gt;$(TargetDir)..\..\H5tinit.c"

 			/>

 		</Configuration>

 	</Configurations>

diff --git a/windows/src/H5Tinit.c b/windows/src/H5Tinit.c
deleted file mode 100755
index f6b0ecf..0000000
--- a/windows/src/H5Tinit.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/* Generated automatically by H5detect -- do not edit */
-
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Created:		Mar 31, 2006
- *			
- *
- * Purpose:		This machine-generated source code contains
- *			information about the various integer and
- *			floating point numeric formats found on this
- *			architecture.  The parameters below should be
- *			checked carefully and errors reported to the
- *			HDF5 maintainer.
- *			
- *			Each of the numeric formats listed below are
- *			printed from most significant bit to least
- *			significant bit even though the actual bytes
- *			might be stored in a different order in
- *			memory.	 The integers above each binary byte
- *			indicate the relative order of the bytes in
- *			memory; little-endian machines have
- *			decreasing numbers while big-endian machines
- *			have increasing numbers.
- *			
- *			The fields of the numbers are printed as
- *			letters with `S' for the mantissa sign bit,
- *			`M' for the mantissa magnitude, and `E' for
- *			the exponent.  The exponent has an associated
- *			bias which can be subtracted to find the
- *			true exponent.	The radix point is assumed
- *			to be before the first `M' bit.	 Any bit
- *			of a floating-point value not falling into one
- *			of these categories is printed as a question
- *			mark.  Bits of integer types are printed as
- *			`I' for 2's complement and `U' for magnitude.
- *			
- *			If the most significant bit of the normalized
- *			mantissa (always a `1' except for `0.0') is
- *			not stored then an `implicit=yes' appears
- *			under the field description.  In thie case,
- *			the radix point is still assumed to be
- *			before the first `M' but after the implicit
- *			bit.
- *
- * Modifications:
- *
- *	DO NOT MAKE MODIFICATIONS TO THIS FILE!
- *	It was generated by code in `H5detect.c'.
- *
- *-------------------------------------------------------------------------
- */
-
-#define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/
-
-#include "H5private.h"
-#include "H5Iprivate.h"
-#include "H5Eprivate.h"
-#include "H5FLprivate.h"
-#include "H5Tpkg.h"
-
-
-
-herr_t
-H5TN_init_interface(void)
-{
-    H5T_t	*dt = NULL;
-    herr_t	ret_value = SUCCEED;
-
-    FUNC_ENTER_NOAPI(H5TN_init_interface, FAIL);
-
-   /*
-    *    0
-    * IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 1;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 8;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_SCHAR_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_SCHAR_ALIGN_g = 1;
-    H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1;
-
-   /*
-    *    0
-    * UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 1;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 8;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_UCHAR_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_UCHAR_ALIGN_g = 1;
-
-   /*
-    *    1        0
-    * IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 2;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 16;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_SHORT_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_SHORT_ALIGN_g = 1;
-    H5T_NATIVE_SHORT_COMP_ALIGN_g = 2;
-
-   /*
-    *    1        0
-    * UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 2;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 16;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_USHORT_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_USHORT_ALIGN_g = 1;
-
-   /*
-    *    3        2        1        0
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_INT_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_INT_ALIGN_g = 1;
-    H5T_NATIVE_INT_COMP_ALIGN_g = 4;
-
-   /*
-    *    3        2        1        0
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_UINT_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_UINT_ALIGN_g = 1;
-
-   /*
-    *    3        2        1        0
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_LONG_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_LONG_ALIGN_g = 1;
-    H5T_NATIVE_LONG_COMP_ALIGN_g = 4;
-
-   /*
-    *    3        2        1        0
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_ULONG_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_ULONG_ALIGN_g = 1;
-
-   /*
-    *    0
-    * IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 1;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 8;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_INT8_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_INT8_ALIGN_g = 1;
-
-   /*
-    *    0
-    * UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 1;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 8;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_UINT8_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_UINT8_ALIGN_g = 1;
-
-   /*
-    *    1        0
-    * IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 2;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 16;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_INT16_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_INT16_ALIGN_g = 1;
-
-   /*
-    *    1        0
-    * UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 2;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 16;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_UINT16_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_UINT16_ALIGN_g = 1;
-
-   /*
-    *    3        2        1        0
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_INT32_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_INT32_ALIGN_g = 1;
-
-   /*
-    *    3        2        1        0
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_UINT32_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_UINT32_ALIGN_g = 1;
-
-   /*
-    *    7        6        5        4
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    *    3        2        1        0
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 8;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 64;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_INT64_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_INT64_ALIGN_g = 1;
-
-   /*
-    *    7        6        5        4
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    *    3        2        1        0
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 8;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 64;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_UINT64_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_UINT64_ALIGN_g = 1;
-
-   /*
-    *    7        6        5        4
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    *    3        2        1        0
-    * IIIIIIII IIIIIIII IIIIIIII IIIIIIII
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 8;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 64;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_2;
-    if ((H5T_NATIVE_LLONG_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_LLONG_ALIGN_g = 1;
-    H5T_NATIVE_LLONG_COMP_ALIGN_g = 8;
-
-   /*
-    *    7        6        5        4
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    *    3        2        1        0
-    * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_INTEGER;
-    dt->shared->size = 8;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 64;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE;
-    if ((H5T_NATIVE_ULLONG_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_ULLONG_ALIGN_g = 1;
-
-   /*
-    *    3        2        1        0
-    * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM
-    * Implicit bit? yes
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_FLOAT;
-    dt->shared->size = 4;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 32;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.f.sign = 31;
-    dt->shared->u.atomic.u.f.epos = 23;
-    dt->shared->u.atomic.u.f.esize = 8;
-    dt->shared->u.atomic.u.f.ebias = 0x0000007f;
-    dt->shared->u.atomic.u.f.mpos = 0;
-    dt->shared->u.atomic.u.f.msize = 23;
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
-    if ((H5T_NATIVE_FLOAT_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_FLOAT_ALIGN_g = 1;
-    H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4;
-
-   /*
-    *    7        6        5        4
-    * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM
-    *    3        2        1        0
-    * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
-    * Implicit bit? yes
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_FLOAT;
-    dt->shared->size = 8;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 64;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.f.sign = 63;
-    dt->shared->u.atomic.u.f.epos = 52;
-    dt->shared->u.atomic.u.f.esize = 11;
-    dt->shared->u.atomic.u.f.ebias = 0x000003ff;
-    dt->shared->u.atomic.u.f.mpos = 0;
-    dt->shared->u.atomic.u.f.msize = 52;
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
-    if ((H5T_NATIVE_DOUBLE_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_DOUBLE_ALIGN_g = 1;
-    H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8;
-
-   /*
-    *    7        6        5        4
-    * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM
-    *    3        2        1        0
-    * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM
-    * Implicit bit? yes
-    * Alignment: none
-    */
-    if(NULL == (dt = H5T_alloc()))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,"memory allocation failed")
-    dt->shared->state = H5T_STATE_IMMUTABLE;
-    dt->shared->type = H5T_FLOAT;
-    dt->shared->size = 8;
-    dt->shared->u.atomic.order = H5T_ORDER_LE;
-    dt->shared->u.atomic.offset = 0;
-    dt->shared->u.atomic.prec = 64;
-    dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO;
-    dt->shared->u.atomic.u.f.sign = 63;
-    dt->shared->u.atomic.u.f.epos = 52;
-    dt->shared->u.atomic.u.f.esize = 11;
-    dt->shared->u.atomic.u.f.ebias = 0x000003ff;
-    dt->shared->u.atomic.u.f.mpos = 0;
-    dt->shared->u.atomic.u.f.msize = 52;
-    dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED;
-    dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO;
-    if ((H5T_NATIVE_LDOUBLE_g = H5I_register (H5I_DATATYPE, dt))<0)
-        HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL,"can't initialize type system (atom registration failure");
-    H5T_NATIVE_LDOUBLE_ALIGN_g = 1;
-    H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 8;
-
-    /* Set the native order for this machine */
-    H5T_native_order_g = H5T_ORDER_LE;
-
-    /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
-    H5T_POINTER_COMP_ALIGN_g = 4;
-    H5T_HVL_COMP_ALIGN_g = 4;
-    H5T_HOBJREF_COMP_ALIGN_g = 8;
-    H5T_HDSETREGREF_COMP_ALIGN_g = 1;
-
-done:
-    if(ret_value<0) {
-        if(dt != NULL) {
-            if(dt->shared != NULL)
-                H5FL_FREE(H5T_shared_t, dt->shared);
-            H5FL_FREE(H5T_t, dt);
-        } /* end if */
-    }
-
-    FUNC_LEAVE_NOAPI(ret_value);
-}
diff --git a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj
index 4ed9f1c..81d75d6 100644
--- a/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj
+++ b/windows_vnet/misc/typegen/h5tinit/h5tinit.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\..\..\..\..\src"

-			IntermediateDirectory=".\..\..\..\..\src"

+			OutputDirectory=".\..\..\..\..\src\h5tinit\Release"

+			IntermediateDirectory=".\..\..\..\..\src\h5tinit\Release"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -27,10 +27,10 @@
 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\src/h5tinit.pch"

-				AssemblerListingLocation=".\..\..\..\..\src/"

-				ObjectFile=".\..\..\..\..\src/"

-				ProgramDataBaseFileName=".\..\..\..\..\src/"

+				PrecompiledHeaderFile=".\..\..\..\..\src\h5tinit\Release/h5tinit.pch"

+				AssemblerListingLocation=".\..\..\..\..\src\h5tinit\Release"

+				ObjectFile=".\..\..\..\..\src\h5tinit\Release"

+				ProgramDataBaseFileName=".\..\..\..\..\src\h5tinit\Release"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"/>

 			<Tool

@@ -38,10 +38,10 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="WS2_32.lib"

-				OutputFile=".\..\..\..\..\src/h5tinit.exe"

+				OutputFile=".\..\..\..\..\src\h5tinit\Release/h5tinit.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\src/h5tinit.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\src\h5tinit\Release/h5tinit.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

@@ -51,7 +51,7 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5tinit.c"

-				CommandLine="..\..\..\..\src\h5tinit.exe &gt; ..\..\..\..\src\H5tinit.c"/>

+				CommandLine=".\..\..\..\..\src\h5tinit\Release\h5tinit.exe &gt; ..\..\..\..\src\H5tinit.c"/>

 			<Tool

 				Name="VCPreBuildEventTool"/>

 			<Tool

@@ -73,8 +73,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\..\..\..\..\src"

-			IntermediateDirectory=".\..\..\..\..\src"

+			OutputDirectory=".\..\..\..\..\src\h5tinit\Debug"

+			IntermediateDirectory=".\..\..\..\..\src\h5tinit\Debug"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="FALSE"

@@ -86,10 +86,10 @@
 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

 				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\..\..\..\..\src/h5tinit.pch"

-				AssemblerListingLocation=".\..\..\..\..\src/"

-				ObjectFile=".\..\..\..\..\src/"

-				ProgramDataBaseFileName=".\..\..\..\..\src/"

+				PrecompiledHeaderFile=".\..\..\..\..\src\h5tinit\Debug/h5tinit.pch"

+				AssemblerListingLocation=".\..\..\..\..\src\h5tinit\Debug"

+				ObjectFile=".\..\..\..\..\src\h5tinit\Debug"

+				ProgramDataBaseFileName=".\..\..\..\..\src\h5tinit\Debug"

 				WarningLevel="3"

 				SuppressStartupBanner="TRUE"

 				DebugInformationFormat="3"/>

@@ -98,12 +98,12 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="WS2_32.lib"

-				OutputFile=".\..\..\..\..\src/h5tinit.exe"

+				OutputFile=".\..\..\..\..\src\h5tinit\Debug/h5tinit.exe"

 				LinkIncremental="1"

 				SuppressStartupBanner="TRUE"

 				ForceSymbolReferences="_gethostname@8"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\..\..\..\..\src/h5tinit.pdb"

+				ProgramDatabaseFile=".\..\..\..\..\src\h5tinit\Debug/h5tinit.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

@@ -113,7 +113,7 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				Description="Generating H5tinit.c"

-				CommandLine="..\..\..\..\src\h5tinit.exe &gt; ..\..\..\..\src\H5tinit.c"/>

+				CommandLine=".\..\..\..\..\src\h5tinit\Debug\h5tinit.exe &gt; ..\..\..\..\src\H5tinit.c"/>

 			<Tool

 				Name="VCPreBuildEventTool"/>

 			<Tool