diff options
author | Scott Wegner <swegner@hdfgroup.org> | 2007-08-03 14:44:44 (GMT) |
---|---|---|
committer | Scott Wegner <swegner@hdfgroup.org> | 2007-08-03 14:44:44 (GMT) |
commit | e2477c8d0b76325590f43be8926634f16da5f849 (patch) | |
tree | 9f73c547c447d6af4efc0c9dddcea619a3269aa0 /windows_vs6/hl | |
parent | 7f2265149224ffa99b7a9825d4faf0b4823f4562 (diff) | |
download | hdf5-e2477c8d0b76325590f43be8926634f16da5f849.zip hdf5-e2477c8d0b76325590f43be8926634f16da5f849.tar.gz hdf5-e2477c8d0b76325590f43be8926634f16da5f849.tar.bz2 |
[svn-r14036] Purpose: Fix Windows debug DLL naming scheme
Description:
At a previous seminar, it was brought up that the naming scheme for Windows debug DLL is inconsistent. Specifically, some use *ddll, while others use *dlld. *dlld is more widely-used, so we decided this is "correct". This changes others to use this scheme, and adapts other projects / install scripts / documentation.
Tested:
Visual Studio .NET on WinXP
Diffstat (limited to 'windows_vs6/hl')
7 files changed, 7 insertions, 7 deletions
diff --git a/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp b/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp index b1258ec..13ab112 100755 --- a/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp +++ b/windows_vs6/hl/examples/ex_dsdll/ex_dsdll.dsp @@ -79,7 +79,7 @@ BSC32=bscmake.exe # 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 hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
+# 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 hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
!ENDIF
diff --git a/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp b/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp index d7d353b..750777f 100755 --- a/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp +++ b/windows_vs6/hl/examples/ex_imagesdll/ex_imagesdll.dsp @@ -77,7 +77,7 @@ BSC32=bscmake.exe # 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 hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
+# 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 hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
!ENDIF
diff --git a/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp b/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp index e43c72e..b6ab8ca 100755 --- a/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp +++ b/windows_vs6/hl/examples/ex_litedll/ex_litedll.dsp @@ -77,7 +77,7 @@ BSC32=bscmake.exe # 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 hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
+# 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 hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
!ENDIF
diff --git a/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp b/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp index 607b25a..2121e8d 100755 --- a/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp +++ b/windows_vs6/hl/examples/ex_packetdll/ex_packetdll.dsp @@ -78,7 +78,7 @@ BSC32=bscmake.exe # 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 hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
+# 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 hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
!ENDIF
diff --git a/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp b/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp index 14ccd1e..fb88a85 100755 --- a/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp +++ b/windows_vs6/hl/examples/ex_tabledll/ex_tabledll.dsp @@ -77,7 +77,7 @@ BSC32=bscmake.exe # 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 hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
+# 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 hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\hdf5lib\debug\dll\\" /libpath:"..\..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\..\proj\hdf5_hldll\debug"
!ENDIF
diff --git a/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp b/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp index 7786256..2253114 100644 --- a/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp +++ b/windows_vs6/hl/fortran/examples/ex_litedll/ex_litedll.dsp @@ -79,7 +79,7 @@ BSC32=bscmake.exe # 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 /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 hdf5_fortranddll.lib hdf5_hl_fortrandlld.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" /pdbtype:sept /libpath:"..\..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\..\proj\hdf5_hl_fortrandll\debug"
+# 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 hdf5_fortranddll.lib hdf5_hl_fortranddll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" /pdbtype:sept /libpath:"..\..\..\..\..\proj\hdf5_fortrandll\debug" /libpath:"..\..\..\..\..\proj\hdf5_hl_fortrandll\debug"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp b/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp index 79c8468..ca1d3bd 100755 --- a/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp +++ b/windows_vs6/hl/test/hl_test_dsdll/hl_test_dsdll.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=xilink6.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 /libpath:"..\..\..\..\proj\hdf5_hldll\hdf5_hldlld.dll"
+# 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 /libpath:"..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"
!ELSEIF "$(CFG)" == "hl_test_dsdll - Win32 Debug"
|