summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2007-05-05 16:03:35 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2007-05-05 16:03:35 (GMT)
commit8829cafe908b8ee999c4c6e398a87158593d6520 (patch)
tree23eb0dcd716298b9c5269ecedf556d4d29ebfd96
parent8762243f56137098f9fe85f8935cb8fe3f8dfa09 (diff)
downloadhdf5-8829cafe908b8ee999c4c6e398a87158593d6520.zip
hdf5-8829cafe908b8ee999c4c6e398a87158593d6520.tar.gz
hdf5-8829cafe908b8ee999c4c6e398a87158593d6520.tar.bz2
[svn-r13734] Added new source files (from rev. 13721) to Windows project files.
Note: ohdr_gentst currently fails on Windows, and is disabled by default. I'm working with Quincy to get this fixed. Tested: VS6 on WinXP
-rw-r--r--MANIFEST1
-rwxr-xr-xwindows/proj/all/all.dsw15
-rwxr-xr-xwindows/proj/hdf5/hdf5.dsp185
-rwxr-xr-xwindows/proj/hdf5dll/hdf5dll.dsp27
-rw-r--r--windows/test/ohdr_gentst/ohdr_gentst.dsp104
5 files changed, 241 insertions, 91 deletions
diff --git a/MANIFEST b/MANIFEST
index 5bfd060..d535745 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1813,6 +1813,7 @@
./windows/test/objcopy/objcopy.dsp
./windows/test/ohdrdll/ohdrdll.dsp
./windows/test/ohdr/ohdr.dsp
+./windows/test/ohdr_gentst/ohdr_gentst.dsp
./windows/test/overheaddll/overheaddll.dsp
./windows/test/overhead/overhead.dsp
./windows/test/pooldll/pooldll.dsp
diff --git a/windows/proj/all/all.dsw b/windows/proj/all/all.dsw
index d3a8c26..92f6d43 100755
--- a/windows/proj/all/all.dsw
+++ b/windows/proj/all/all.dsw
@@ -3120,6 +3120,21 @@ Package=<4>
###############################################################################
+Project: "ohdr_gentst"="..\..\TEST\ohdr_gentst\ohdr_gentst.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name hdf5
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "ohdrdll"="..\..\test\ohdrdll\ohdrdll.dsp" - Package Owner=<4>
Package=<5>
diff --git a/windows/proj/hdf5/hdf5.dsp b/windows/proj/hdf5/hdf5.dsp
index a37dd95..cdea27d 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
@@ -643,6 +643,36 @@ SOURCE=..\..\..\src\H5E.c
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Edeprec.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\H5Eint.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\H5F.c
!IF "$(CFG)" == "hdf5 - Win32 Release"
@@ -1730,6 +1760,21 @@ SOURCE=..\..\..\src\H5O.c
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Oainfo.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\H5Oalloc.c
!IF "$(CFG)" == "hdf5 - Win32 Release"
@@ -2082,6 +2127,21 @@ SOURCE=..\..\..\src\H5Opline.c
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Orefcount.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\H5Osdspace.c
!IF "$(CFG)" == "hdf5 - Win32 Release"
@@ -2116,6 +2176,21 @@ SOURCE=..\..\..\src\H5Oshared.c
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Oshmesg.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\H5Ostab.c
!IF "$(CFG)" == "hdf5 - Win32 Release"
@@ -2148,6 +2223,21 @@ SOURCE=..\..\..\src\H5Otest.c
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Ounknown.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\H5P.c
!IF "$(CFG)" == "hdf5 - Win32 Release"
@@ -3273,6 +3363,10 @@ SOURCE=..\..\..\src\H5Dpublic.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Epkg.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\H5Eprivate.h
# End Source File
# Begin Source File
@@ -3432,84 +3526,5 @@ SOURCE=..\..\..\src\H5Zpublic.h
SOURCE=..\..\..\src\hdf5.h
# End Source File
# End Group
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Edeprec.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\H5Eint.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\H5Epkg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\H5Oainfo.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\H5Orefcount.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\H5Oshmesg.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
# End Target
# End Project
diff --git a/windows/proj/hdf5dll/hdf5dll.dsp b/windows/proj/hdf5dll/hdf5dll.dsp
index 9debc1c..e1c7ed0 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
@@ -2355,6 +2355,21 @@ SOURCE=..\..\..\src\H5Otest.c
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\H5Ounknown.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\H5P.c
!IF "$(CFG)" == "hdf5dll - Win32 Release"
diff --git a/windows/test/ohdr_gentst/ohdr_gentst.dsp b/windows/test/ohdr_gentst/ohdr_gentst.dsp
new file mode 100644
index 0000000..3df8342
--- /dev/null
+++ b/windows/test/ohdr_gentst/ohdr_gentst.dsp
@@ -0,0 +1,104 @@
+# Microsoft Developer Studio Project File - Name="ohdr_gentst" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=ohdr_gentst - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "ohdr_gentst.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "ohdr_gentst.mak" CFG="ohdr_gentst - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "ohdr_gentst - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "ohdr_gentst - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "ohdr_gentst - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "../../../test/ohdr_gentst/Release"
+# PROP Intermediate_Dir "../../../test/ohdr_gentst/Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "ohdr_gentst - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "../../../test/ohdr_gentst/Debug"
+# PROP Intermediate_Dir "../../../test/ohdr_gentst/Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+F90=df.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "ohdr_gentst - Win32 Release"
+# Name "ohdr_gentst - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\gen_bogus.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project