[svn-r13863] Added H5FDwindows.c to Windows project files, although sec2 is still the default.

Also added a Windows-specific macro, WINDOWS_USE_STDIO, which users can define if they'd like the Windows VFD to use the buffered low-level I/O functions.  This is instead of splitting our Windows driver into two separate drivers.  By default, this macro is undefined.

Tested:
VS6 on WinXP
This commit is contained in:
Scott Wegner 2007-06-14 08:23:59 -05:00
parent 61952803b3
commit d05df8434b
3 changed files with 52 additions and 16 deletions

View File

@ -97,12 +97,12 @@ LIB32=link.exe -lib
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
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
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
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 ""
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
F90=df.exe
# ADD BASE F90 /compile_only /include:"hdf5___0/" /nologo /warn:nofileopt
# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@ -890,6 +890,21 @@ SOURCE=..\..\..\src\H5FDstream.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\H5FDwindows.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\H5Ffake.c
!IF "$(CFG)" == "hdf5 - Win32 Release"

View File

@ -107,12 +107,12 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
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
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
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 ""
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
F90=df.exe
# ADD BASE F90 /compile_only /include:"hdf5dll0/" /dll /nologo /warn:nofileopt
# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@ -964,6 +964,21 @@ SOURCE=..\..\..\src\H5FDstream.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\H5FDwindows.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\H5Ffake.c
!IF "$(CFG)" == "hdf5dll - Win32 Release"

View File

@ -118,13 +118,19 @@ in the file file_io.win32.c and including it on the projects
#define H5_HAVE_SZLIB_H 1
#define H5_HAVE_FILTER_SZIP 1
/* comment the following line out if you don't want to build the windows file
driver */
#define H5_HAVE_WINDOWS
/* change the following line if you would like to change the default file driver */
#define H5_DEFAULT_VFD H5FD_SEC2
/* comment the following line out if you don't want to build the windows file
driver */
#define H5_HAVE_WINDOWS 1
#ifdef H5_HAVE_WINDOWS
/* uncomment the following line if you would like to use the buffered stdio
functions in the Windows file driver. */
// #define WINDOWS_USE_STDIO 1
#endif /* H5_HAVE_WINDOWS */
/* comment the following line out if you are not using N-bit filter*/
/* #define H5_HAVE_FILTER_NBIT 1*/