diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-04-30 19:51:13 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2008-04-30 19:51:13 (GMT) |
| commit | aec106e324ce20e5efb725c25a6a333c7970127b (patch) | |
| tree | 234df369115a46b08037c5f385061cf58823e497 /windows/tools/h5jam | |
| parent | 5773fd34bc5adf59b4530d95ac9f0c0585902803 (diff) | |
| download | hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.zip hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.tar.gz hdf5-aec106e324ce20e5efb725c25a6a333c7970127b.tar.bz2 | |
[svn-r14903] Undoing change committed in r14902.
Diffstat (limited to 'windows/tools/h5jam')
| -rw-r--r-- | windows/tools/h5jam/h5jam.vcproj | 17 | ||||
| -rw-r--r-- | windows/tools/h5jam/testh5jam.bat | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/windows/tools/h5jam/h5jam.vcproj b/windows/tools/h5jam/h5jam.vcproj index 729e946..6b03953 100644 --- a/windows/tools/h5jam/h5jam.vcproj +++ b/windows/tools/h5jam/h5jam.vcproj @@ -4,6 +4,7 @@ Version="8.00"
Name="h5jam"
ProjectGUID="{196F5935-2391-49A7-B6A2-410DF8149F0D}"
+ RootNamespace="h5jam"
>
<Platforms>
<Platform
@@ -21,7 +22,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -76,7 +77,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"
SubSystem="1"
@@ -112,7 +113,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -168,7 +169,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"
SubSystem="1"
@@ -204,7 +205,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -258,7 +259,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
@@ -296,7 +297,7 @@ OutputDirectory="..\..\..\tools\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;..\..\proj\property_sheets\remove-posix-warnings.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
@@ -351,7 +352,7 @@ Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP)"
OutputFile="$(OutDir)\$(ProjectName).exe"
- LinkIncremental="1"
+ LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
diff --git a/windows/tools/h5jam/testh5jam.bat b/windows/tools/h5jam/testh5jam.bat index d3522f1..9a9c5d4 100644 --- a/windows/tools/h5jam/testh5jam.bat +++ b/windows/tools/h5jam/testh5jam.bat @@ -249,7 +249,7 @@ rem rem Compare to 'cmpfile', result is set in result1
set tfile=tt1
%getub_bin% -c %size% %hfile% > %tfile%
- fc /w %cmpfile% %tfile% | find "FC: no diff" > nul
+ fc /w %cmpfile% %tfile% > nul
if %errorlevel% neq 0 (
fc /w %cmpfile% %file%
set result1=1
@@ -595,4 +595,4 @@ rem ############################################################################ popd
endlocal & exit /b %nerrors%
-
\ No newline at end of file +
|