From 1a332eb5a2edc5638b0d5aea5fa5461b31ce957f Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Mon, 17 Sep 2007 09:18:20 -0500 Subject: [svn-r14149] Purpose: Add new source files to Windows projects Description: Two new files, h5rdeprec.c and h5rpkg.h were added to the Windows HDF5 projects. Tested: VS2005, build only. --- windows/proj/hdf5/hdf5.vcproj | 8 + windows/proj/hdf5dll/hdf5dll.vcproj | 416 ++++++++++++++++++----------------- windows_vs6/proj/hdf5/hdf5.dsp | 31 ++- windows_vs6/proj/hdf5dll/hdf5dll.dsp | 31 ++- 4 files changed, 270 insertions(+), 216 deletions(-) diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj index b35437c..fa6fee2 100644 --- a/windows/proj/hdf5/hdf5.vcproj +++ b/windows/proj/hdf5/hdf5.vcproj @@ -6823,6 +6823,10 @@ + + + + diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj index 9333c33..186ba36 100644 --- a/windows/proj/hdf5dll/hdf5dll.vcproj +++ b/windows/proj/hdf5dll/hdf5dll.vcproj @@ -6867,6 +6867,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows_vs6/proj/hdf5/hdf5.dsp b/windows_vs6/proj/hdf5/hdf5.dsp index a92def2..77c5352 100755 --- a/windows_vs6/proj/hdf5/hdf5.dsp +++ b/windows_vs6/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 @@ -2524,6 +2524,21 @@ SOURCE=..\..\..\src\H5RC.c # End Source File # Begin Source File +SOURCE=..\..\..\src\H5Rdeprec.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\H5RS.c !IF "$(CFG)" == "hdf5 - Win32 Release" @@ -3557,6 +3572,10 @@ SOURCE=..\..\..\src\H5RCprivate.h # End Source File # Begin Source File +SOURCE=..\..\..\src\H5Rpkg.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\H5Rprivate.h # End Source File # Begin Source File diff --git a/windows_vs6/proj/hdf5dll/hdf5dll.dsp b/windows_vs6/proj/hdf5dll/hdf5dll.dsp index 1e4df11..5447208 100755 --- a/windows_vs6/proj/hdf5dll/hdf5dll.dsp +++ b/windows_vs6/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 @@ -2672,6 +2672,21 @@ SOURCE=..\..\..\src\H5RC.c # End Source File # Begin Source File +SOURCE=..\..\..\src\H5Rdeprec.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\H5RS.c !IF "$(CFG)" == "hdf5dll - Win32 Release" @@ -3775,6 +3790,10 @@ SOURCE=..\..\..\src\H5RCprivate.h # End Source File # Begin Source File +SOURCE=..\..\..\src\H5Rpkg.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\H5Rprivate.h # End Source File # Begin Source File -- cgit v0.12