diff options
author | Scott Wegner <swegner@hdfgroup.org> | 2008-01-15 15:48:07 (GMT) |
---|---|---|
committer | Scott Wegner <swegner@hdfgroup.org> | 2008-01-15 15:48:07 (GMT) |
commit | 6a5cb6a480878f42e102473edce24df9d388de7d (patch) | |
tree | b3fbf6c944774bf5bccbf48b0ea4e539844d8751 | |
parent | 1feea1cfc1942bcd6e99e083f0d317465579b15e (diff) | |
download | hdf5-6a5cb6a480878f42e102473edce24df9d388de7d.zip hdf5-6a5cb6a480878f42e102473edce24df9d388de7d.tar.gz hdf5-6a5cb6a480878f42e102473edce24df9d388de7d.tar.bz2 |
[svn-r14416] Purpose: Add source files to Windows projects
Description:
This catches up Windows to most of the new source files that have been added. Specifically, H5FDpkg.h and H5FDspace.c have been added to the library projects, and tcoords.c has been added to testhdf5. This goes for VS2005 and VS6 project files.
Tested:
Only built, VS2005
-rw-r--r-- | windows/proj/hdf5/hdf5.vcproj | 8 | ||||
-rw-r--r-- | windows/proj/hdf5dll/hdf5dll.vcproj | 8 | ||||
-rw-r--r-- | windows/test/testhdf5/testhdf5.vcproj | 4 | ||||
-rw-r--r-- | windows/test/testhdf5dll/testhdf5dll.vcproj | 4 | ||||
-rwxr-xr-x | windows_vs6/proj/hdf5/hdf5.dsp | 31 | ||||
-rwxr-xr-x | windows_vs6/proj/hdf5dll/hdf5dll.dsp | 31 | ||||
-rwxr-xr-x | windows_vs6/test/testhdf5/testhdf5.dsp | 15 | ||||
-rwxr-xr-x | windows_vs6/test/testhdf5dll/testhdf5dll.dsp | 15 |
8 files changed, 104 insertions, 12 deletions
diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj index 2a8e9c3..732026b 100644 --- a/windows/proj/hdf5/hdf5.vcproj +++ b/windows/proj/hdf5/hdf5.vcproj @@ -2265,6 +2265,10 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5FDspace.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\H5FDstdio.c"
>
<FileConfiguration
@@ -9095,6 +9099,10 @@ >
</File>
<File
+ RelativePath="..\..\..\src\H5FDpkg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\H5Fprivate.h"
>
</File>
diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj index ee40d50..1816939 100644 --- a/windows/proj/hdf5dll/hdf5dll.vcproj +++ b/windows/proj/hdf5dll/hdf5dll.vcproj @@ -2363,6 +2363,10 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5FDspace.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\H5FDstdio.c"
>
<FileConfiguration
@@ -9196,6 +9200,10 @@ >
</File>
<File
+ RelativePath="..\..\..\src\H5FDpkg.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\H5Fprivate.h"
>
</File>
diff --git a/windows/test/testhdf5/testhdf5.vcproj b/windows/test/testhdf5/testhdf5.vcproj index bf502eb..19e6912 100644 --- a/windows/test/testhdf5/testhdf5.vcproj +++ b/windows/test/testhdf5/testhdf5.vcproj @@ -565,6 +565,10 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\test\tcoords.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\test\testframe.c"
>
<FileConfiguration
diff --git a/windows/test/testhdf5dll/testhdf5dll.vcproj b/windows/test/testhdf5dll/testhdf5dll.vcproj index b57333f..f44720b 100644 --- a/windows/test/testhdf5dll/testhdf5dll.vcproj +++ b/windows/test/testhdf5dll/testhdf5dll.vcproj @@ -557,6 +557,10 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\test\tcoords.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\test\testhdf5.c"
>
<FileConfiguration
diff --git a/windows_vs6/proj/hdf5/hdf5.dsp b/windows_vs6/proj/hdf5/hdf5.dsp index 6213373..405e0a7 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
@@ -901,6 +901,21 @@ SOURCE=..\..\..\src\H5FDsec2.c # End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5FDspace.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\H5FDstdio.c
!IF "$(CFG)" == "hdf5 - Win32 Release"
@@ -3523,6 +3538,10 @@ SOURCE=..\..\..\src\H5Epublic.h # End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5FDpkg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\H5Fprivate.h
# End Source File
# Begin Source File
diff --git a/windows_vs6/proj/hdf5dll/hdf5dll.dsp b/windows_vs6/proj/hdf5dll/hdf5dll.dsp index 65750d8..bfe3cde 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
@@ -971,6 +971,21 @@ SOURCE=..\..\..\src\H5FDsec2.c # End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5FDspace.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\H5FDstdio.c
!IF "$(CFG)" == "hdf5dll - Win32 Release"
@@ -3747,6 +3762,10 @@ SOURCE=..\..\..\src\H5Epublic.h # End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5FDpkg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\H5Fprivate.h
# End Source File
# Begin Source File
diff --git a/windows_vs6/test/testhdf5/testhdf5.dsp b/windows_vs6/test/testhdf5/testhdf5.dsp index cab8848..ac8dab2 100755 --- a/windows_vs6/test/testhdf5/testhdf5.dsp +++ b/windows_vs6/test/testhdf5/testhdf5.dsp @@ -213,6 +213,21 @@ SOURCE=..\..\..\test\tconfig.c # End Source File
# Begin Source File
+SOURCE=..\..\..\test\tcoords.c
+
+!IF "$(CFG)" == "testhdf5 - Win32 Release"
+
+!ELSEIF "$(CFG)" == "testhdf5 - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "testhdf5 - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "testhdf5 - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\test\testframe.c
!IF "$(CFG)" == "testhdf5 - Win32 Release"
diff --git a/windows_vs6/test/testhdf5dll/testhdf5dll.dsp b/windows_vs6/test/testhdf5dll/testhdf5dll.dsp index 67c8f4f..03d6774b 100755 --- a/windows_vs6/test/testhdf5dll/testhdf5dll.dsp +++ b/windows_vs6/test/testhdf5dll/testhdf5dll.dsp @@ -215,6 +215,21 @@ SOURCE=..\..\..\test\tconfig.c # End Source File
# Begin Source File
+SOURCE=..\..\..\test\tcoords.c
+
+!IF "$(CFG)" == "testhdf5dll - Win32 Release"
+
+!ELSEIF "$(CFG)" == "testhdf5dll - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "testhdf5dll - Win32 AlphaDbg"
+
+!ELSEIF "$(CFG)" == "testhdf5dll - Win32 AlphaRel"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\test\testhdf5.c
!IF "$(CFG)" == "testhdf5dll - Win32 Release"
|