diff options
| author | Scott Wegner <swegner@hdfgroup.org> | 2008-09-19 17:15:22 (GMT) |
|---|---|---|
| committer | Scott Wegner <swegner@hdfgroup.org> | 2008-09-19 17:15:22 (GMT) |
| commit | 8dd19b5db53978a8ccd5d476ceaf482160e16439 (patch) | |
| tree | b992c6702911a354fab8426fe6cfde6c261d92fd /windows | |
| parent | ed54f5ab7ecd07411b1c83d71b8bab79c9ee6be4 (diff) | |
| download | hdf5-8dd19b5db53978a8ccd5d476ceaf482160e16439.zip hdf5-8dd19b5db53978a8ccd5d476ceaf482160e16439.tar.gz hdf5-8dd19b5db53978a8ccd5d476ceaf482160e16439.tar.bz2 | |
[svn-r15661] Purpose: Add szip/zlib link dependencies to Windows earray[dll] projects
Description:
earray[dll] builds were failing on Windows because of missing link dependencies to szip and zlib libraries (amongst other reasons). This checkin adds those dependencies.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/test/earray/earray.vcproj | 42 | ||||
| -rw-r--r-- | windows/test/earraydll/earraydll.vcproj | 42 |
2 files changed, 42 insertions, 42 deletions
diff --git a/windows/test/earray/earray.vcproj b/windows/test/earray/earray.vcproj index caad7dd..2af3404 100644 --- a/windows/test/earray/earray.vcproj +++ b/windows/test/earray/earray.vcproj @@ -64,7 +64,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@@ -96,12 +96,11 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,12 +116,16 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -139,13 +142,11 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
- LinkIncremental="1"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -173,11 +174,12 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|Win32"
OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -193,16 +195,12 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -219,11 +217,13 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
- LinkIncremental="2"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -295,7 +295,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
diff --git a/windows/test/earraydll/earraydll.vcproj b/windows/test/earraydll/earraydll.vcproj index 7f359bc..8855c9a 100644 --- a/windows/test/earraydll/earraydll.vcproj +++ b/windows/test/earraydll/earraydll.vcproj @@ -64,7 +64,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@@ -96,12 +96,11 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug|x64"
OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -117,12 +116,16 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -139,13 +142,11 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
- LinkIncremental="1"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -173,11 +174,12 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
+ Name="Release|Win32"
OutputDirectory="..\..\..\test\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -193,16 +195,12 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_;_HDF5TESTUSEDLL_"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -219,11 +217,13 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
- LinkIncremental="2"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
+ LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -295,7 +295,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
+ AdditionalDependencies="WS2_32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
|