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/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/hl')
7 files changed, 7 insertions, 7 deletions
diff --git a/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj index c6f6a8d..7aef8e9 100644 --- a/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj +++ b/windows/hl/examples/ex_dsdll/ex_dsdll.vcproj @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile=".\..\..\..\..\hl\examples\ex_dsdll\Debug/ex_dsdll.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj index 97483f5..7ec9819 100644 --- a/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj +++ b/windows/hl/examples/ex_imagesdll/ex_imagesdll.vcproj @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile=".\..\..\..\..\hl\examples\ex_imagesdll\Debug/ex_imagesdll.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/windows/hl/examples/ex_litedll/ex_litedll.vcproj b/windows/hl/examples/ex_litedll/ex_litedll.vcproj index cf3727f..5eada93 100644 --- a/windows/hl/examples/ex_litedll/ex_litedll.vcproj +++ b/windows/hl/examples/ex_litedll/ex_litedll.vcproj @@ -100,7 +100,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile=".\..\..\..\..\hl\examples\ex_litedll\Debug/ex_litedll.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj index b497422..33a9f34 100644 --- a/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj +++ b/windows/hl/examples/ex_packetdll/ex_packetdll.vcproj @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile=".\..\..\..\..\hl\examples\ex_packetdll\Debug/ex_packetdll.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj index 4c7cc20..ab7807b 100644 --- a/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj +++ b/windows/hl/examples/ex_tabledll/ex_tabledll.vcproj @@ -100,7 +100,7 @@ Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hldlld.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ AdditionalDependencies="odbc32.lib odbccp32.lib hdf5ddll.lib hdf5_hlddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile=".\..\..\..\..\hl\examples\ex_tabledll\Debug/ex_tabledll.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj index 3a892cd..b01bc47 100644 --- a/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj +++ b/windows/hl/fortran/examples/ex_litedll/ex_litedll.vfproj @@ -9,7 +9,7 @@ <Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug/;..\..\..\..\..\proj\hdf5_hl_fortrandll\debug/" WarnArgMismatch="true" CallingConvention="callConventionCVF" ModulePath="Debug/" ObjectFile="$(INTDIR)/" AssemblerListingLocation="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>
<Tool Name="VFCustomBuildTool"/>
- <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" AdditionalOptions="/MACHINE:I386" OutputFile="..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="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"/>
+ <Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" AdditionalOptions="/MACHINE:I386" OutputFile="..\..\..\..\..\hl\fortran\examples\ex_litedll\Debug\ex_litedll.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\..\..\..\proj\hdf5_fortrandll\debug,..\..\..\..\..\proj\hdf5_hl_fortrandll\debug" IgnoreDefaultLibraryNames="libc.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/ex_litedll.pdb" SubSystem="subSystemConsole" AdditionalDependencies="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"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFResourceCompilerTool" SwitchesHaveChanged="true" PreprocessorDefinitions="_DEBUG" Culture="rcEnglishUS" ResourceOutputFileName="$(INTDIR)/$(InputName).res"/></Configuration>
<Configuration Name="Release|Win32" OutputDirectory="..\..\..\..\..\hl\fortran\examples\ex_litedll\Release" IntermediateDirectory="..\..\..\..\..\hl\fortran\examples\ex_litedll\Release" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="c:\hdf\hdf5-18\vnet\dep_vs6\windows\hl\fortran\examples\ex_litedll\$(OUTDIR)\ex_litedll.exe">
diff --git a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj index 7148b6d..c253a2f 100644 --- a/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj +++ b/windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj @@ -43,7 +43,7 @@ OutputFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hldlld.dll"
+ AdditionalLibraryDirectories="..\..\..\..\proj\hdf5_hldll\hdf5_hlddll.dll"
ProgramDatabaseFile=".\../../../../hl/test/hl_test_dsdll/Release/hl_test_dsdll.pdb"
SubSystem="1"
TargetMachine="1"/>
|