summaryrefslogtreecommitdiffstats
path: root/windows/tools
diff options
context:
space:
mode:
Diffstat (limited to 'windows/tools')
-rw-r--r--windows/tools/h5copy/h5copy.vcproj39
-rw-r--r--windows/tools/h5copy/testh5copy.bat43
-rw-r--r--windows/tools/h5debug/h5debug.vcproj39
-rw-r--r--windows/tools/h5debugdll/h5debugdll.vcproj39
-rw-r--r--windows/tools/h5diff/h5diff.vcproj39
-rw-r--r--windows/tools/h5diff/testh5diff.bat186
-rw-r--r--windows/tools/h5diffdll/h5diffdll.vcproj39
-rw-r--r--windows/tools/h5dump/h5dump.vcproj39
-rw-r--r--windows/tools/h5dumpdll/h5dumpdll.vcproj39
-rw-r--r--windows/tools/h5import/h5import.vcproj39
-rw-r--r--windows/tools/h5importdll/h5importdll.vcproj39
-rw-r--r--windows/tools/h5jam/h5jam.vcproj39
-rw-r--r--windows/tools/h5ls/h5ls.vcproj39
-rw-r--r--windows/tools/h5lsdll/h5lsdll.vcproj39
-rw-r--r--windows/tools/h5mkgrp/h5mkgrp.vcproj39
-rw-r--r--windows/tools/h5repack/h5repack.vcproj39
-rw-r--r--windows/tools/h5repackdll/h5repackdll.vcproj39
-rw-r--r--windows/tools/h5repart/h5repart.vcproj39
-rw-r--r--windows/tools/h5repartdll/h5repartdll.vcproj39
-rw-r--r--windows/tools/h5stat/h5stat.vcproj39
-rw-r--r--windows/tools/h5stat/testh5stat.bat7
-rw-r--r--windows/tools/h5statdll/h5statdll.vcproj39
-rw-r--r--windows/tools/h5unjam/h5unjam.vcproj39
-rw-r--r--windows/tools/talign/talign.vcproj39
-rw-r--r--windows/tools/taligndll/taligndll.vcproj39
-rw-r--r--windows/tools/testfiles/binread/binread.vcproj39
-rw-r--r--windows/tools/testfiles/h5difftst/h5difftst.vcproj43
-rw-r--r--windows/tools/testfiles/h5dumptst/h5dumptst.vcproj39
-rw-r--r--windows/tools/testfiles/h5importtst/h5importtst.vcproj39
-rw-r--r--windows/tools/testfiles/h5jamtst/h5jamtst.vcproj39
-rw-r--r--windows/tools/testfiles/h5repacktst/h5repacktst.vcproj39
-rw-r--r--windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj39
-rw-r--r--windows/tools/testfiles/h5reparttst/h5reparttst.vcproj39
-rw-r--r--windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj39
-rw-r--r--windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj39
-rw-r--r--windows/tools/toolslib/toolslib.vcproj11
-rw-r--r--windows/tools/toolslibdll/toolslibdll.vcproj11
37 files changed, 819 insertions, 691 deletions
diff --git a/windows/tools/h5copy/h5copy.vcproj b/windows/tools/h5copy/h5copy.vcproj
index bc0a7cf..3e5c9db 100644
--- a/windows/tools/h5copy/h5copy.vcproj
+++ b/windows/tools/h5copy/h5copy.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5copy"
ProjectGUID="{69952435-F01F-46A7-B907-A78EBC864ED7}"
RootNamespace="h5copy"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5copy/Debug/h5copy.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5copy/Debug/h5copy.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -234,7 +233,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -252,7 +251,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -267,6 +266,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -288,9 +289,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -327,7 +325,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -345,7 +343,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -360,6 +358,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5copy/Release/h5copy.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -381,9 +381,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
index 6207521..a0e164a 100644
--- a/windows/tools/h5copy/testh5copy.bat
+++ b/windows/tools/h5copy/testh5copy.bat
@@ -26,6 +26,9 @@ rem setup to support it if we do in the future. --SJW 8/22/07
setlocal enabledelayedexpansion
pushd %~dp0
+set EXIT_SUCCESS=0
+set EXIT_FAILURE=1
+
rem The tool name
set h5copy=h5copy%2
rem The path of the tool binary
@@ -44,7 +47,8 @@ set h5ls_bin=%CD%\..\%h5ls%\%1\%h5ls%
set /a nerrors=0
set verbose=yes
-set srcfile=h5copytst.h5
+set srcfile1=h5copytst.h5
+set srcfile2=h5copy_ref.h5
set indir=%CD%\testfiles
set outdir=%CD%\..\testfiles
@@ -123,7 +127,7 @@ rem $* everything else arguments for h5copy.
if "%3"=="-o" (
set outputfile=%4
) else (
- set h5diff=no
+ set runh5diff=no
)
(
@@ -164,7 +168,7 @@ rem $* everything else arguments for h5copy.
if "%3"=="-o" (
set outputfile=%4
) else (
- set h5diff=no
+ set runh5diff=no
)
(
@@ -293,8 +297,8 @@ rem Assumed arguments:
rem <none>
:copyobjects
- set testfile=%indir%\%srcfile%
- set fileout=%outdir%\%srcfile:.h5=.out.h5%
+ set testfile=%indir%\%srcfile1%
+ set fileout=%outdir%\%srcfile1:.h5=.out.h5%
rem Remove any output file left over from previous test run
del /f %fileout% 2> nul
@@ -346,6 +350,34 @@ rem <none>
exit /b
+
+rem Copy references in various way.
+rem adding to the destination file each time compare the result
+rem
+rem Assumed arguments:
+rem <none>
+:copyreferences
+
+ set testfile=%indir%\%srcfile2%
+ set fileout=%outdir%\%srcfile2:.h5=.out.h5%
+
+ rem Remove any output file left over from previous test run
+ del /f %fileout% 2> nul
+
+ echo.Test copying object and region references
+ rem echo.TOOLTEST -f ref -i $TESTFILE -o $FILEOUT -v -s / -d /COPY
+ call :tooltest -f ref -i %testfile% -o %fileout% -v -s / -d /COPY
+
+ rem Verify that the file created above is correct
+ call :h5lstest %fileout%
+
+ rem Remove output file created, if the "no cleanup" environment variable is
+ rem not defined
+ if not defined HDF5_NOCLEANUP (
+ del /f %fileout%
+ )
+
+ exit /b
rem ##############################################################################
rem ### T H E T E S T S ###
@@ -353,6 +385,7 @@ rem ############################################################################
:main
call :copyobjects
+ call :copyreferences
if %nerrors% equ 0 (
echo.All h5copy tests passed.
diff --git a/windows/tools/h5debug/h5debug.vcproj b/windows/tools/h5debug/h5debug.vcproj
index 8a3ad7a..82143a9 100644
--- a/windows/tools/h5debug/h5debug.vcproj
+++ b/windows/tools/h5debug/h5debug.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5debug"
ProjectGUID="{BE1A0022-708E-4CC2-B01C-26BD99AB6576}"
RootNamespace="h5debug"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5debug/Debug/h5debug.pch"
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5debug/Debug/h5debug.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5debug/Debug/h5debug.pch"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5debug/Debug/h5debug.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -265,6 +264,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -286,9 +287,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -325,7 +323,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -343,7 +341,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5debug/Release/h5debug.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5debugdll/h5debugdll.vcproj b/windows/tools/h5debugdll/h5debugdll.vcproj
index 2fe2041..4c9131e 100644
--- a/windows/tools/h5debugdll/h5debugdll.vcproj
+++ b/windows/tools/h5debugdll/h5debugdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5debugdll"
ProjectGUID="{D10F67D0-8057-49C2-A62A-12D0C512288E}"
RootNamespace="h5debugdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -80,6 +81,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5debugdll/Release/h5debugdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -171,6 +171,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5debugdll/Release/h5debugdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -229,7 +228,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pch"
@@ -246,7 +245,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -260,6 +259,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -281,9 +282,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -319,7 +317,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pch"
@@ -336,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -350,6 +348,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5debugdll/Debug/h5debugdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -371,9 +371,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5diff/h5diff.vcproj b/windows/tools/h5diff/h5diff.vcproj
index 038f651..5e8de50 100644
--- a/windows/tools/h5diff/h5diff.vcproj
+++ b/windows/tools/h5diff/h5diff.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5diff"
ProjectGUID="{1C5A9EC8-F882-4A8A-B773-E79CD46369AF}"
RootNamespace="h5diff"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -83,6 +84,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5diff/Debug/h5diff.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -104,9 +107,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -177,6 +177,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5diff/Debug/h5diff.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -198,9 +200,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -236,7 +235,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -254,7 +253,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -269,6 +268,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -290,9 +291,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -329,7 +327,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -347,7 +345,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -362,6 +360,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5diff/Release/h5diff.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -383,9 +383,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index 4b5f265..afbef81 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -16,7 +16,7 @@ rem
rem Tests for the h5diff tool
rem
rem Created: Scott Wegner, 8/22/07
-rem Modified: Scott Wegner, 11/19/07
+rem Modified: Allen Byrne, 2/23/10
rem
setlocal enabledelayedexpansion
@@ -39,6 +39,15 @@ set srcfile8=h5diff_dset2.h5
set srcfile9=h5diff_hyper1.h5
set srcfile10=h5diff_hyper2.h5
set srcfile11=h5diff_empty.h5
+set srcfile12=h5diff_links.h5
+set srcfile13=h5diff_softlinks.h5
+set srcfile14=h5diff_linked_softlink.h5
+set srcfile15=h5diff_extlink_src.h5
+set srcfile16=h5diff_extlink_trg.h5
+set srcfile17=h5diff_ext2softlink_src.h5
+set srcfile18=h5diff_ext2softlink_trg.h5
+set srclnkfile1=h5diff_danglelinks1.h5
+set srclnkfile2=h5diff_danglelinks2.h5
set file1=%indir%\h5diff_basic1.h5
set file2=%indir%\h5diff_basic2.h5
@@ -51,6 +60,15 @@ set file8=%indir%\h5diff_dset2.h5
set file9=%indir%\h5diff_hyper1.h5
set file10=%indir%\h5diff_hyper2.h5
set file11=%indir%\h5diff_empty.h5
+set file12=%indir%\h5diff_links.h5
+set file13=%indir%\h5diff_softlinks.h5
+set file14=%indir%\h5diff_linked_softlink.h5
+set file15=%indir%\h5diff_extlink_src.h5
+set file16=%indir%\h5diff_extlink_trg.h5
+set file17=%indir%\h5diff_ext2softlink_src.h5
+set file18=%indir%\h5diff_ext2softlink_trg.h5
+set lnkfile1=%indir%\h5diff_danglelinks1.h5
+set lnkfile2=%indir%\h5diff_danglelinks2.h5
rem The tool name
@@ -58,6 +76,9 @@ set h5diff=h5diff%2
rem The path of the tool binary
set h5diff_bin=%CD%\..\%h5diff%\%1\%h5diff%
+set EXIT_SUCCESS=0
+set EXIT_FAILURE=1
+
set /a nerrors=0
set verbose=yes
rem default to run h5diff tests
@@ -155,12 +176,14 @@ rem
%h5diff_bin% %params%
popd
) > %actual% 2> %actual_err%
+ set EXIT_CODE=!errorlevel!
rem save actual and actual_err in case they are needed later.
copy /y %actual% %actual_sav% > nul
call :stdout_filter %actual%
copy /y %actual_err% %actual_err_sav% > nul
call :stderr_filter %actual_err%
type %actual_err% >> %actual%
+ echo EXIT CODE: !EXIT_CODE! >> %actual%
if not exist %expect% (
rem Create the expect file if it doesn't yet exist.
@@ -532,13 +555,172 @@ rem ############################################################################
call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset5 g2/dset6
call :tooltest h5diff_205.txt -c %file2% %file2% g2/dset5 g2/dset6
- rem New option added rev #16461 - ADB 2/11/2009
+ rem New option added - ADB 2/11/2009
rem # not comparable in compound
call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset7 g2/dset8
call :tooltest h5diff_206.txt -c %file2% %file2% g2/dset7 g2/dset8
call :testing %h5diff% -c %srcfile2% %srcfile2% g2/dset8 g2/dset9
call :tooltest h5diff_207.txt -c %file2% %file2% g2/dset8 g2/dset9
+
+ rem ##############################################################################
+ rem # Links compare without --follow-links nor --no-dangling-links
+ rem ##############################################################################
+ rem test for bug1749
+ call :testing %h5diff% -v %srcfile12% %srcfile12% /link_g1 /link_g2
+ call :tooltest h5diff_300.txt -v %file12% %file12% /link_g1 /link_g2
+
+ rem ##############################################################################
+ rem # Links compare with --follow-links Only
+ rem ##############################################################################
+ rem soft links file to file
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13%
+ call :tooltest h5diff_400.txt --follow-links -v %file13% %file13%
+
+ rem softlink vs dset"
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_dset1_1 /target_dset2
+ call :tooltest h5diff_401.txt --follow-links -v %file13% %file13% /softlink_dset1_1 /target_dset2
+
+ rem dset vs softlink"
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /target_dset2 /softlink_dset1_1
+ call :tooltest h5diff_402.txt --follow-links -v %file13% %file13% /target_dset2 /softlink_dset1_1
+
+ rem softlink vs softlink"
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_dset1_1 /softlink_dset2
+ call :tooltest h5diff_403.txt --follow-links -v %file13% %file13% /softlink_dset1_1 /softlink_dset2
+
+ rem extlink vs extlink (FILE)"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15%
+ call :tooltest h5diff_404.txt --follow-links -v %file15% %file15%
+
+ rem extlink vs dset"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile16% /ext_link_dset1 /target_group2/x_dset
+ call :tooltest h5diff_405.txt --follow-links -v %file15% %file16% /ext_link_dset1 /target_group2/x_dset
+
+ rem dset vs extlink"
+ call :testing %h5diff% --follow-links -v %srcfile16% %srcfile15% /target_group2/x_dset /ext_link_dset1
+ call :tooltest h5diff_406.txt --follow-links -v %file16% %file15% /target_group2/x_dset /ext_link_dset1
+
+ rem extlink vs extlink"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_dset2
+ call :tooltest h5diff_407.txt --follow-links -v %file15% %file15% /ext_link_dset1 /ext_link_dset2
+
+ rem softlink vs extlink"
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile15% /softlink_dset1_1 /ext_link_dset2
+ call :tooltest h5diff_408.txt --follow-links -v %file13% %file15% /softlink_dset1_1 /ext_link_dset2
+
+ rem extlink vs softlink "
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile13% /ext_link_dset2 /softlink_dset1_1
+ call :tooltest h5diff_409.txt --follow-links -v %file15% %file13% /ext_link_dset2 /softlink_dset1_1
+
+ rem linked_softlink vs linked_softlink (FILE)"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14%
+ call :tooltest h5diff_410.txt --follow-links -v %file14% %file14%
+
+ rem dset2 vs linked_softlink_dset1"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /target_dset2 /softlink1_to_slink2
+ call :tooltest h5diff_411.txt --follow-links -v %file14% %file14% /target_dset2 /softlink1_to_slink2
+
+ rem rem linked_softlink_dset1 vs dset2"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink1_to_slink2 /target_dset2
+ call :tooltest h5diff_412.txt --follow-links -v %file14% %file14% /softlink1_to_slink2 /target_dset2
+
+ rem linked_softlink_to_dset1 vs linked_softlink_to_dset2"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink1_to_slink2 /softlink2_to_slink2
+ call :tooltest h5diff_413.txt --follow-links -v %file14% %file14% /softlink1_to_slink2 /softlink2_to_slink2
+
+ rem group vs linked_softlink_group1"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /target_group /softlink3_to_slink2
+ call :tooltest h5diff_414.txt --follow-links -v %file14% %file14% /target_group /softlink3_to_slink2
+
+ rem linked_softlink_group1 vs group"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink3_to_slink2 /target_group
+ call :tooltest h5diff_415.txt --follow-links -v %file14% %file14% /softlink3_to_slink2 /target_group
+
+ rem linked_softlink_to_group1 vs linked_softlink_to_group2"
+ call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink3_to_slink2 /softlink4_to_slink2
+ call :tooltest h5diff_416.txt --follow-links -v %file14% %file14% /softlink3_to_slink2 /softlink4_to_slink2
+
+ rem non-exist-softlink vs softlink"
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_noexist /softlink_dset2
+ call :tooltest h5diff_417.txt --follow-links -v %file13% %file13% /softlink_noexist /softlink_dset2
+
+ rem softlink vs non-exist-softlink"
+ call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist
+ call :tooltest h5diff_418.txt --follow-links -v %file13% %file13% /softlink_dset2 /softlink_noexist
+
+ rem non-exist-extlink_file vs extlink"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_noexist2 /ext_link_dset2
+ call :tooltest h5diff_419.txt --follow-links -v %file15% %file15% /ext_link_noexist2 /ext_link_dset2
+
+ rem exlink vs non-exist-extlink_file"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist2
+ call :tooltest h5diff_420.txt --follow-links -v %file15% %file15% /ext_link_dset2 /ext_link_noexist2
+
+ rem extlink vs non-exist-extlink_obj"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist1
+ call :tooltest h5diff_421.txt --follow-links -v %file15% %file15% /ext_link_dset2 /ext_link_noexist1
+
+ rem non-exist-extlink_obj vs extlink"
+ call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_dset2
+ call :tooltest h5diff_422.txt --follow-links -v %file15% %file15% /ext_link_noexist1 /ext_link_dset2
+
+ rem extlink_to_softlink_to_dset1 vs dset2"
+ call :testing %h5diff% --follow-links -v %srcfile17% %srcfile18% /ext_link_to_slink1 /dset2
+ call :tooltest h5diff_423.txt --follow-links -v %file17% %file18% /ext_link_to_slink1 /dset2
+
+ rem dset2 vs extlink_to_softlink_to_dset1"
+ call :testing %h5diff% --follow-links -v %srcfile18% %srcfile17% /dset2 /ext_link_to_slink1
+ call :tooltest h5diff_424.txt --follow-links -v %file18% %file17% /dset2 /ext_link_to_slink1
+
+ rem extlink_to_softlink_to_dset1 vs extlink_to_softlink_to_dset2"
+ call :testing %h5diff% --follow-links -v %srcfile17% %srcfile17% /ext_link_to_slink1 /ext_link_to_slink2
+ call :tooltest h5diff_425.txt --follow-links -v %file17% %file17% /ext_link_to_slink1 /ext_link_to_slink2
+
+
+ rem ##############################################################################
+ rem # Dangling links compare (--follow-links and --no-dangling-links)
+ rem ##############################################################################
+ rem dangling links --follow-links (FILE to FILE)
+ call :testing %h5diff% --follow-links -v %srclnkfile1% %srclnkfile2%
+ call :tooltest h5diff_450.txt --follow-links -v %lnkfile1% %lnkfile2%
+
+ rem dangling links --follow-links and --no-dangling-links (FILE to FILE)
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srclnkfile1% %srclnkfile2%
+ call :tooltest h5diff_451.txt --follow-links -v --no-dangling-links %lnkfile1% %lnkfile2%
+
+ rem try --no-dangling-links without --follow-links options
+ call :testing %h5diff% --no-dangling-links %srcfile13% %srcfile13%
+ call :tooltest h5diff_452.txt --no-dangling-links %file13% %file13%
+
+ rem dangling link found for soft links (FILE to FILE)
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile13% %srcfile13%
+ call :tooltest h5diff_453.txt --follow-links -v --no-dangling-links %file13% %file13%
+
+ rem dangling link found for soft links (obj to obj)
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist
+ call :tooltest h5diff_454.txt --follow-links -v --no-dangling-links %file13% %file13% /softlink_dset2 /softlink_noexist
+
+ rem dangling link found for soft links (obj to obj) Both dangle links
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile13% %srcfile13% /softlink_noexist /softlink_noexist
+ call :tooltest h5diff_455.txt --follow-links -v --no-dangling-links %file13% %file13% /softlink_noexist /softlink_noexist
+
+ rem dangling link found for ext links (FILE to FILE)
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15%
+ call :tooltest h5diff_456.txt --follow-links -v --no-dangling-links %file15% %file15%
+
+ rem dangling link found for ext links (obj to obj). target file exist
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist1
+ call :tooltest h5diff_457.txt --follow-links -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist1
+
+ rem dangling link found for ext links (obj to obj). target file NOT exist
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist2
+ call :tooltest h5diff_458.txt --follow-links -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist2
+
+ rem dangling link found for ext links (obj to obj). Both dangle links
+ call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_noexist2
+ call :tooltest h5diff_459.txt --follow-links -v --no-dangling-links %file15% %file15% /ext_link_noexist1 /ext_link_noexist2
+
rem ##############################################################################
rem # END
diff --git a/windows/tools/h5diffdll/h5diffdll.vcproj b/windows/tools/h5diffdll/h5diffdll.vcproj
index 6310151..bd153bd 100644
--- a/windows/tools/h5diffdll/h5diffdll.vcproj
+++ b/windows/tools/h5diffdll/h5diffdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5diffdll"
ProjectGUID="{EC6B5EAD-D938-4211-A7B1-01C9D2C15160}"
RootNamespace="h5diffdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -80,6 +81,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5diffdll/Release/h5diffdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -171,6 +171,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5diffdll/Release/h5diffdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -229,7 +228,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -247,7 +246,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -261,6 +260,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -282,9 +283,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -320,7 +318,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -338,7 +336,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -352,6 +350,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5diffdll/Debug/h5diffdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -373,9 +373,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5dump/h5dump.vcproj b/windows/tools/h5dump/h5dump.vcproj
index 38e38c3..d3e6d71 100644
--- a/windows/tools/h5dump/h5dump.vcproj
+++ b/windows/tools/h5dump/h5dump.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5dump"
ProjectGUID="{9A8352DF-AA1E-4FE0-9494-F9D6B4E10CA2}"
RootNamespace="h5dump"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5dump/Debug/h5dump.pch"
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5dump/Debug/h5dump.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5dump/Debug/h5dump.pch"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5dump/Debug/h5dump.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -265,6 +264,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -286,9 +287,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -325,7 +323,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -343,7 +341,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5dump/Release/h5dump.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5dumpdll/h5dumpdll.vcproj b/windows/tools/h5dumpdll/h5dumpdll.vcproj
index db20eef..bbe33d0 100644
--- a/windows/tools/h5dumpdll/h5dumpdll.vcproj
+++ b/windows/tools/h5dumpdll/h5dumpdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5dumpdll"
ProjectGUID="{7E207F6A-DC28-4DEB-8454-7977092131DC}"
RootNamespace="h5dumpdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -80,6 +81,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -171,6 +171,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5dumpdll/Release/h5dumpdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -230,7 +229,7 @@
AdditionalOptions="/I /I&quot;..\..tools&quot;/Fp&quot;Debug/h5dumpdll.pch&quot; "
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pch"
@@ -247,7 +246,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -261,6 +260,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -282,9 +283,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -321,7 +319,7 @@
AdditionalOptions="/I /I&quot;..\..tools&quot;/Fp&quot;Debug/h5dumpdll.pch&quot; "
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pch"
@@ -338,7 +336,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -352,6 +350,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5dumpdll/Debug/h5dumpdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -373,9 +373,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5import/h5import.vcproj b/windows/tools/h5import/h5import.vcproj
index c50e224..72cdb7b 100644
--- a/windows/tools/h5import/h5import.vcproj
+++ b/windows/tools/h5import/h5import.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5import"
ProjectGUID="{9E588AD8-14BD-4BA3-B4EA-16D1D882C700}"
RootNamespace="h5import"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5import/Release/h5import.pch"
@@ -64,7 +65,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -79,6 +80,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -100,9 +103,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -138,7 +138,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5import/Release/h5import.pch"
@@ -154,7 +154,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -169,6 +169,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5import/Release/h5import.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -190,9 +192,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -227,7 +226,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5import/Debug/h5import.pch"
@@ -244,7 +243,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -260,6 +259,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5import/Debug/h5import.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -281,9 +282,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -319,7 +317,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5import/Debug/h5import.pch"
@@ -336,7 +334,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -352,6 +350,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5import/Debug/h5import.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -373,9 +373,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5importdll/h5importdll.vcproj b/windows/tools/h5importdll/h5importdll.vcproj
index 175fe2d..9960816 100644
--- a/windows/tools/h5importdll/h5importdll.vcproj
+++ b/windows/tools/h5importdll/h5importdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5importdll"
ProjectGUID="{2DCDB978-79B7-4A3A-B24A-D908A49B7D50}"
RootNamespace="h5importdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5importdll/Release/h5importdll.pch"
@@ -64,7 +65,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -77,6 +78,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5importdll/Release/h5importdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -98,9 +101,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -136,7 +136,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5importdll/Release/h5importdll.pch"
@@ -152,7 +152,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -165,6 +165,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5importdll/Release/h5importdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -186,9 +188,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -223,7 +222,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5importdll/Debug/h5importdll.pch"
@@ -240,7 +239,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -254,6 +253,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5importdll/Debug/h5importdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -275,9 +276,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -313,7 +311,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5importdll/Debug/h5importdll.pch"
@@ -330,7 +328,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -344,6 +342,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5importdll/Debug/h5importdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -365,9 +365,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5jam/h5jam.vcproj b/windows/tools/h5jam/h5jam.vcproj
index c27cd36..37b1835 100644
--- a/windows/tools/h5jam/h5jam.vcproj
+++ b/windows/tools/h5jam/h5jam.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5jam"
ProjectGUID="{196F5935-2391-49A7-B6A2-410DF8149F0D}"
RootNamespace="h5jam"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5jam/Release/h5jam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -231,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -249,7 +248,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -265,6 +264,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5jam/Debug/h5jam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -286,9 +287,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -324,7 +322,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5jam/Debug/h5jam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5ls/h5ls.vcproj b/windows/tools/h5ls/h5ls.vcproj
index d843ba5..e1001ef 100644
--- a/windows/tools/h5ls/h5ls.vcproj
+++ b/windows/tools/h5ls/h5ls.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5ls"
ProjectGUID="{357A1E1A-D5EA-42FB-B4B1-EEB8A4B2BBF0}"
RootNamespace="h5ls"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5ls/Release/h5ls.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -233,7 +232,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5ls/Debug/h5ls.pch"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -266,6 +265,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5ls/Debug/h5ls.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -287,9 +288,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -325,7 +323,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5ls/Debug/h5ls.pch"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5ls/Debug/h5ls.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5lsdll/h5lsdll.vcproj b/windows/tools/h5lsdll/h5lsdll.vcproj
index f6f280e..7d1dc0e 100644
--- a/windows/tools/h5lsdll/h5lsdll.vcproj
+++ b/windows/tools/h5lsdll/h5lsdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5lsdll"
ProjectGUID="{18FBE8C2-CD20-4D99-9E0B-63B408CE4850}"
RootNamespace="h5lsdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pch"
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -79,6 +80,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -100,9 +103,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -138,7 +138,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pch"
@@ -155,7 +155,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -169,6 +169,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5lsdll/Debug/h5lsdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -190,9 +192,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -228,7 +227,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -246,7 +245,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -259,6 +258,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5lsdll/Release/h5lsdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -280,9 +281,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -319,7 +317,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -337,7 +335,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -350,6 +348,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5lsdll/Release/h5lsdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -371,9 +371,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5mkgrp/h5mkgrp.vcproj b/windows/tools/h5mkgrp/h5mkgrp.vcproj
index 729ad04..e6f8259 100644
--- a/windows/tools/h5mkgrp/h5mkgrp.vcproj
+++ b/windows/tools/h5mkgrp/h5mkgrp.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5mkgrp"
ProjectGUID="{ABBF8F3E-F1B5-45FA-8FD0-50B167511EDF}"
RootNamespace="h5mkgrp"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5mkgrp/Release/h5mkgrp.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -231,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -249,7 +248,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -264,6 +263,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -285,9 +286,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -323,7 +321,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -341,7 +339,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -356,6 +354,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5mkgrp/Debug/h5mkgrp.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -377,9 +377,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5repack/h5repack.vcproj b/windows/tools/h5repack/h5repack.vcproj
index d251153..5025431 100644
--- a/windows/tools/h5repack/h5repack.vcproj
+++ b/windows/tools/h5repack/h5repack.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5repack"
ProjectGUID="{411D221C-9FA1-417E-8A2B-DF746F4C7E07}"
RootNamespace="h5repack"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5repack/Release/h5repack.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -233,7 +232,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -252,7 +251,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -269,6 +268,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -290,9 +291,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -328,7 +326,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -347,7 +345,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -364,6 +362,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repack/Debug/h5repack.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -385,9 +385,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5repackdll/h5repackdll.vcproj b/windows/tools/h5repackdll/h5repackdll.vcproj
index 651e0a4..cde7ab3 100644
--- a/windows/tools/h5repackdll/h5repackdll.vcproj
+++ b/windows/tools/h5repackdll/h5repackdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5repackdll"
ProjectGUID="{854F7E09-CEB5-44CD-B924-3FFAC7936323}"
RootNamespace="h5repackdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -80,6 +81,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -139,7 +139,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -171,6 +171,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repackdll/Debug/h5repackdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -230,7 +229,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -248,7 +247,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -261,6 +260,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5repackdll/Release/h5repackdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -282,9 +283,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -321,7 +319,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib,..\..\..\test"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -339,7 +337,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -352,6 +350,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5repackdll/Release/h5repackdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -373,9 +373,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5repart/h5repart.vcproj b/windows/tools/h5repart/h5repart.vcproj
index 09e2c80..19fb2c0 100644
--- a/windows/tools/h5repart/h5repart.vcproj
+++ b/windows/tools/h5repart/h5repart.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5repart"
ProjectGUID="{F2E38A8C-F3A3-4DA4-B9C2-11C753FF51BF}"
RootNamespace="h5repart"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/h5repart/Release/h5repart.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -233,7 +232,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5repart/Debug/h5repart.pch"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -266,6 +265,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repart/Debug/h5repart.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -287,9 +288,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -325,7 +323,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5repart/Debug/h5repart.pch"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repart/Debug/h5repart.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5repartdll/h5repartdll.vcproj b/windows/tools/h5repartdll/h5repartdll.vcproj
index aef32ab..498b38f 100644
--- a/windows/tools/h5repartdll/h5repartdll.vcproj
+++ b/windows/tools/h5repartdll/h5repartdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5repartdll"
ProjectGUID="{89DA820B-7A3B-46FA-AE09-971A739BEEFD}"
RootNamespace="h5repartdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pch"
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -79,6 +80,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -100,9 +103,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -138,7 +138,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pch"
@@ -155,7 +155,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -169,6 +169,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5repartdll/Debug/h5repartdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -190,9 +192,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -228,7 +227,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -246,7 +245,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -259,6 +258,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5repartdll/Release/h5repartdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -280,9 +281,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -319,7 +317,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG;WIN32;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -337,7 +335,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -350,6 +348,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5repartdll/Release/h5repartdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -371,9 +371,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5stat/h5stat.vcproj b/windows/tools/h5stat/h5stat.vcproj
index 6c9bc8a..f9b5d12 100644
--- a/windows/tools/h5stat/h5stat.vcproj
+++ b/windows/tools/h5stat/h5stat.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5stat"
ProjectGUID="{405F6F0A-DBE6-4A4E-AAE2-D4D514BA0CF5}"
RootNamespace="h5stat"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Debug/h5stat.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -264,6 +263,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -285,9 +286,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -324,7 +322,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -356,6 +354,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5stat/Release/h5stat.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -377,9 +377,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5stat/testh5stat.bat b/windows/tools/h5stat/testh5stat.bat
index 06ab4ba..3969c7e 100644
--- a/windows/tools/h5stat/testh5stat.bat
+++ b/windows/tools/h5stat/testh5stat.bat
@@ -22,6 +22,9 @@ rem
setlocal enabledelayedexpansion
pushd %~dp0
+set EXIT_SUCCESS=0
+set EXIT_FAILURE=1
+
set h5pubconf=%CD%\..\..\src\h5pubconf.h
rem Determine which filters are available
@@ -160,11 +163,15 @@ rem ############################################################################
call :tooltest h5stat_filters-d.ddl -d h5stat_filters.h5
call :tooltest h5stat_filters-g.ddl -g h5stat_filters.h5
call :tooltest h5stat_filters-dT.ddl -dT h5stat_filters.h5
+ call :tooltest h5stat_filters-UD.ddl -D h5stat_filters.h5
+ call :tooltest h5stat_filters-UT.ddl -T h5stat_filters.h5
rem h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c
rem as of release 1.8.0-alpha4
call :tooltest h5stat_tsohm.ddl h5stat_tsohm.h5
rem h5stat_newgrat.h5 is generated by h5stat_gentest.c
call :tooltest h5stat_newgrat.ddl h5stat_newgrat.h5
+ call :tooltest h5stat_newgrat-UG.ddl -G h5stat_newgrat.h5
+ call :tooltest h5stat_newgrat-UA.ddl -A h5stat_newgrat.h5
echo.
if %nerrors% equ 0 (
diff --git a/windows/tools/h5statdll/h5statdll.vcproj b/windows/tools/h5statdll/h5statdll.vcproj
index 0312772..265de0e 100644
--- a/windows/tools/h5statdll/h5statdll.vcproj
+++ b/windows/tools/h5statdll/h5statdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5statdll"
ProjectGUID="{165195D1-B742-4030-8B12-3FE94B829D45}"
RootNamespace="h5statdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5statdll/Debug/h5statdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5statdll/Debug/h5statdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -263,6 +262,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5statdll/Release/h5statdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -284,9 +285,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -323,7 +321,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -341,7 +339,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -354,6 +352,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5statdll/Release/h5statdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -375,9 +375,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/h5unjam/h5unjam.vcproj b/windows/tools/h5unjam/h5unjam.vcproj
index 20c2f2c..c547869 100644
--- a/windows/tools/h5unjam/h5unjam.vcproj
+++ b/windows/tools/h5unjam/h5unjam.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5unjam"
ProjectGUID="{52E83C17-2B68-44B5-881D-4F6338FB14C7}"
RootNamespace="h5unjam"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5unjam/Release/h5unjam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/h5unjam/Release/h5unjam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -231,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -249,7 +248,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -265,6 +264,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5unjam/Debug/h5unjam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -286,9 +287,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -324,7 +322,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/h5unjam/Debug/h5unjam.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/talign/talign.vcproj b/windows/tools/talign/talign.vcproj
index eb59c88..48d7cce 100644
--- a/windows/tools/talign/talign.vcproj
+++ b/windows/tools/talign/talign.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="talign"
ProjectGUID="{E6A9BFE8-84DE-46C0-A372-72087598018E}"
RootNamespace="talign"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/talign/Debug/talign.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/talign/Debug/talign.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -234,7 +233,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -252,7 +251,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -267,6 +266,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -288,9 +289,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -327,7 +325,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -345,7 +343,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -360,6 +358,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../tools/talign/Release/talign.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -381,9 +381,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/taligndll/taligndll.vcproj b/windows/tools/taligndll/taligndll.vcproj
index 61ec1a2..479457d 100644
--- a/windows/tools/taligndll/taligndll.vcproj
+++ b/windows/tools/taligndll/taligndll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="taligndll"
ProjectGUID="{3BBA31F8-2679-4655-975D-52FDA5ABD5C4}"
RootNamespace="taligndll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/taligndll/Release/taligndll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../tools/taligndll/Release/taligndll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -231,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -249,7 +248,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -264,6 +263,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/taligndll/Debug/taligndll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -285,9 +286,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -323,7 +321,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\tools\misc,..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -341,7 +339,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -356,6 +354,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../tools/taligndll/Debug/taligndll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -377,9 +377,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/binread/binread.vcproj b/windows/tools/testfiles/binread/binread.vcproj
index c839004..428e949 100644
--- a/windows/tools/testfiles/binread/binread.vcproj
+++ b/windows/tools/testfiles/binread/binread.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="binread"
ProjectGUID="{BE9A4A65-F25B-4DCF-8B55-06B3D0C685CB}"
RootNamespace="binread"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -78,6 +79,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Release/binread.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -99,9 +102,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -137,7 +137,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -154,7 +154,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -167,6 +167,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Release/binread.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -188,9 +190,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -224,7 +223,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -241,7 +240,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -255,6 +254,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Debug/binread.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -276,9 +277,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -313,7 +311,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -330,7 +328,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -344,6 +342,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/binread/Debug/binread.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -365,9 +365,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/h5difftst/h5difftst.vcproj b/windows/tools/testfiles/h5difftst/h5difftst.vcproj
index b1dc72b..6b0bc49 100644
--- a/windows/tools/testfiles/h5difftst/h5difftst.vcproj
+++ b/windows/tools/testfiles/h5difftst/h5difftst.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5difftst"
ProjectGUID="{1F80CDF7-B1CB-4303-B282-A21EDC2BDCB4}"
RootNamespace="h5difftst"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Release/h5difftst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -233,7 +232,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -251,7 +250,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -267,6 +266,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -288,9 +289,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -326,7 +324,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -344,7 +342,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -360,6 +358,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5difftst/Debug/h5difftst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -381,9 +381,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -405,11 +402,11 @@
Filter="h;hpp;hxx;hm;inl;fi;fd"
>
<File
- RelativePath="..\..\..\..\tools\h5diff\testh5diff.h"
+ RelativePath="..\..\..\..\tools\lib\h5tools.h"
>
</File>
<File
- RelativePath="..\..\..\..\tools\lib\h5tools.h"
+ RelativePath="..\..\..\..\tools\h5diff\testh5diff.h"
>
</File>
</Filter>
diff --git a/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj b/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
index 4846853..6fc9d0a 100644
--- a/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
+++ b/windows/tools/testfiles/h5dumptst/h5dumptst.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5dumptst"
ProjectGUID="{0A33B4FE-A2C9-4B7F-ACEC-D251308182ED}"
RootNamespace="h5dumptst"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pch"
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pch"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Debug/h5dumptst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -265,6 +264,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -286,9 +287,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -325,7 +323,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -343,7 +341,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\../../../../tools/testfiles/h5dumptst/Release/h5dumptst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/h5importtst/h5importtst.vcproj b/windows/tools/testfiles/h5importtst/h5importtst.vcproj
index 3152347..81bc060 100644
--- a/windows/tools/testfiles/h5importtst/h5importtst.vcproj
+++ b/windows/tools/testfiles/h5importtst/h5importtst.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5importtst"
ProjectGUID="{AF696934-5004-4C1D-90C3-B434E92AFB89}"
RootNamespace="h5importtst"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -80,6 +81,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -139,7 +139,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -157,7 +157,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -171,6 +171,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Debug/h5importtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -230,7 +229,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -248,7 +247,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -261,6 +260,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -282,9 +283,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -321,7 +319,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -339,7 +337,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -352,6 +350,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5importtst/Release/h5importtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -373,9 +373,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj b/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
index 2673a6b..44284e1 100644
--- a/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
+++ b/windows/tools/testfiles/h5jamtst/h5jamtst.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5jamtst"
ProjectGUID="{E8896FEE-8601-4AFC-91EA-6F9698574174}"
RootNamespace="h5jamtst"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -82,6 +83,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -103,9 +106,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -175,6 +175,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Debug/h5jamtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -196,9 +198,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -234,7 +233,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -252,7 +251,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -266,6 +265,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -287,9 +288,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -326,7 +324,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -344,7 +342,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5jamtst/Release/h5jamtst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj b/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
index 7607591..8f65ad5 100644
--- a/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
+++ b/windows/tools/testfiles/h5repacktst/h5repacktst.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5repacktst"
ProjectGUID="{AC4C582B-B27D-4E57-A59F-6FF0E833C6E5}"
RootNamespace="h5repacktst"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -83,6 +84,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -104,9 +107,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -142,7 +142,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -161,7 +161,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -177,6 +177,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Debug/h5repacktst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -198,9 +200,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -236,7 +235,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -254,7 +253,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -268,6 +267,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -289,9 +290,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -328,7 +326,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -346,7 +344,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -360,6 +358,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repacktst/Release/h5repacktst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -381,9 +381,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
index 9c14c8b..dbcf62d 100644
--- a/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
+++ b/windows/tools/testfiles/h5repart_gentest/h5repart_gentest.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5repart_gentest"
ProjectGUID="{EBF7C380-5F58-462D-993D-75B53F83FA81}"
RootNamespace="h5repart_gentest"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Debug/h5repart_gentest.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -264,6 +263,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -285,9 +286,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -324,7 +322,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -356,6 +354,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5repart_gentest/Release/h5repart_gentest.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -377,9 +377,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj b/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
index e9ac6b4..a01dac7 100644
--- a/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
+++ b/windows/tools/testfiles/h5reparttst/h5reparttst.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="h5reparttst"
ProjectGUID="{53022A9D-F5B2-407C-9A29-3AC71B3E6DDC}"
RootNamespace="h5reparttst"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -48,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -66,7 +67,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Debug/h5reparttst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,7 +231,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -250,7 +249,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -264,6 +263,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -285,9 +286,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -324,7 +322,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -356,6 +354,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/h5reparttst/Release/h5reparttst.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -377,9 +377,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
index def2581..dc6c4ba 100644
--- a/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
+++ b/windows/tools/testfiles/testh5repack_detect_szip/testh5repack_detect_szip.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="testh5repack_detect_szip"
ProjectGUID="{5EA5BDAD-3AE9-4BCA-AC1A-93B3B8499C30}"
RootNamespace="testh5repack_detect_szip"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -81,6 +82,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -141,7 +141,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -159,7 +159,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -173,6 +173,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Release/testh5repack_detect_szip.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -194,9 +196,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -231,7 +230,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -249,7 +248,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -265,6 +264,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -286,9 +287,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -324,7 +322,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -342,7 +340,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -358,6 +356,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szip/Debug/testh5repack_detect_szip.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -379,9 +379,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
index a11ff5f..00c0808 100644
--- a/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
+++ b/windows/tools/testfiles/testh5repack_detect_szipdll/testh5repack_detect_szipdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="testh5repack_detect_szipdll"
ProjectGUID="{E75602FF-F4E6-4F45-AD0D-EA49C0C66DEF}"
RootNamespace="testh5repack_detect_szipdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -49,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -67,7 +68,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -80,6 +81,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -140,7 +140,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;NDEBUG"
Culture="1033"
/>
<Tool
@@ -171,6 +171,8 @@
SuppressStartupBanner="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Release/testh5repack_detect_szipdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -192,9 +194,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -229,7 +228,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -247,7 +246,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -261,6 +260,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -282,9 +283,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -320,7 +318,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\src,..\..\..\..\test,..\..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -338,7 +336,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;_DEBUG"
Culture="1033"
/>
<Tool
@@ -352,6 +350,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile=".\../../../../tools/testfiles/testh5repack_detect_szipdll/Debug/testh5repack_detect_szipdll.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
@@ -373,9 +373,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/windows/tools/toolslib/toolslib.vcproj b/windows/tools/toolslib/toolslib.vcproj
index d00a132..e459fbe 100644
--- a/windows/tools/toolslib/toolslib.vcproj
+++ b/windows/tools/toolslib/toolslib.vcproj
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="toolslib"
ProjectGUID="{473ABB63-E5C6-4D8E-9380-5DC76E1EAB4A}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -44,7 +45,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\..\..\..\tools\toolslib\Debug/toolslib.pch"
@@ -116,7 +117,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\..\..\..\tools\toolslib\Debug/toolslib.pch"
@@ -188,7 +189,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -262,7 +263,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
diff --git a/windows/tools/toolslibdll/toolslibdll.vcproj b/windows/tools/toolslibdll/toolslibdll.vcproj
index 38e7d1b..0d163ab 100644
--- a/windows/tools/toolslibdll/toolslibdll.vcproj
+++ b/windows/tools/toolslibdll/toolslibdll.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="toolslibdll"
ProjectGUID="{832DD776-BC7F-40B5-90D0-E6448014CA5B}"
RootNamespace="toolslibdll"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -45,7 +46,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -117,7 +118,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\src"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_WINDOWS;_HDF5USEDLL_"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -189,7 +190,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -262,7 +263,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\src,..\..\..\tools\lib"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_"
+ PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_WINDOWS;_HDF5USEDLL_"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"