[svn-r12993] Update windows project files to reflect the recent library change.

3 files changed, 42 insertions, 108 deletions

diff --git a/windows/proj/all/all.dsw b/windows/proj/all/all.dsw
index 0fbd3fe..64990d2 100755
--- a/windows/proj/all/all.dsw
+++ b/windows/proj/all/all.dsw
@@ -419,102 +419,6 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name vfddll

     End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name dsets_cpp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name dsets_cppdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flush1_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flush1_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flush2_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name flush2_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_cpp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_cppdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_f90cstub

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_f90cstubdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_hl_cpp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_hl_cppdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_hl_f90cstubdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_hl_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hdf5_hl_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_image_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_image_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_lite_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_lite_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_table_cpp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_table_cppdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_table_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name hl_test_table_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libtest_cstubdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libtest_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libtest_fortrandll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name testhdf5_cpp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name testhdf5_cppdll

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name testhdf5_fortran

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name testhdf5_fortrandll

-    End Project Dependency

 }}}

 

 ###############################################################################

diff --git a/windows/proj/hdf5/hdf5.dsp b/windows/proj/hdf5/hdf5.dsp
index 016d588..c1c8e4d 100755
--- a/windows/proj/hdf5/hdf5.dsp
+++ b/windows/proj/hdf5/hdf5.dsp
@@ -97,12 +97,12 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c

 F90=df.exe

 # ADD BASE F90 /browser /compile_only /debug:full /include:"hdf5___W/" /nologo /warn:nofileopt

 # ADD F90 /browser /compile_only /debug:full /include:"Debug/" /nologo /warn:nofileopt

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -122,12 +122,12 @@ LIB32=link.exe -lib
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 F90=df.exe

 # ADD BASE F90 /compile_only /include:"hdf5___0/" /nologo /warn:nofileopt

 # ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -199,6 +199,21 @@ SOURCE=..\..\..\src\H5AC.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Adeprec.c

+

+!IF  "$(CFG)" == "hdf5 - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5 - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5B.c

 

 !IF  "$(CFG)" == "hdf5 - Win32 Release"

diff --git a/windows/proj/hdf5dll/hdf5dll.dsp b/windows/proj/hdf5dll/hdf5dll.dsp
index 2b2acf4..1b78f05 100755
--- a/windows/proj/hdf5dll/hdf5dll.dsp
+++ b/windows/proj/hdf5dll/hdf5dll.dsp
@@ -107,12 +107,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MTd /c

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MDd /c

 F90=df.exe

 # ADD BASE F90 /compile_only /debug:full /include:"hdf5dll_/" /dll /nologo /warn:nofileopt

 # ADD F90 /compile_only /debug:full /include:"Debug/" /dll /nologo /warn:nofileopt

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /MDd /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -138,12 +138,12 @@ LINK32=link.exe
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c

 F90=df.exe

 # ADD BASE F90 /compile_only /include:"hdf5dll0/" /dll /nologo /warn:nofileopt

 # ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt

+CPP=cl.exe

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_HDF5DLL_" /YX /FD /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -227,6 +227,21 @@ SOURCE=..\..\..\src\H5AC.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\src\H5Adeprec.c

+

+!IF  "$(CFG)" == "hdf5dll - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaDbg"

+

+!ELSEIF  "$(CFG)" == "hdf5dll - Win32 AlphaRel"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\src\H5B.c

 

 !IF  "$(CFG)" == "hdf5dll - Win32 Release"