From efb94f8949dae9c65a0a772d61eca6eac09749c3 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 19 Mar 2010 09:48:49 -0500 Subject: [svn-r18430] Add windows define BIND_TO_CURRENT_VCLIBS_VERSION=1 to project files. Corrected copy H5srcdir_str.h commands in script. Added libsettings project to behave like h5tinit.vcproj. --- windows/c++/examples/chunkstest/chunkstest.vcproj | 16 +- .../examples/chunkstestdll/chunkstestdll.vcproj | 16 +- .../c++/examples/compoundtest/compoundtest.vcproj | 16 +- .../compoundtestdll/compoundtestdll.vcproj | 16 +- windows/c++/examples/createtest/createtest.vcproj | 16 +- .../examples/createtestdll/createtestdll.vcproj | 16 +- .../examples/extend_dstest/extend_dstest.vcproj | 16 +- .../extend_dstestdll/extend_dstestdll.vcproj | 16 +- .../c++/examples/h5grouptest/h5grouptest.vcproj | 16 +- .../examples/h5grouptestdll/h5grouptestdll.vcproj | 16 +- .../c++/examples/readdatatest/readdatatest.vcproj | 16 +- .../readdatatestdll/readdatatestdll.vcproj | 16 +- .../examples/writedatatest/writedatatest.vcproj | 16 +- .../writedatatestdll/writedatatestdll.vcproj | 16 +- windows/c++/test/testhdf5_cpp/testhdf5_cpp.vcproj | 16 +- .../test/testhdf5_cppdll/testhdf5_cppdll.vcproj | 16 +- windows/copy_hdf.bat | 10 +- .../examples/attributetest/attributetest.vcproj | 16 +- .../attributetestdll/attributetestdll.vcproj | 16 +- windows/examples/chunkread/chunkread.vcproj | 16 +- windows/examples/chunkreaddll/chunkreaddll.vcproj | 16 +- windows/examples/compoundtest/compoundtest.vcproj | 16 +- .../compoundtestdll/compoundtestdll.vcproj | 16 +- .../extendwritetest/extendwritetest.vcproj | 16 +- .../extendwritetestdll/extendwritetestdll.vcproj | 16 +- windows/examples/grouptest/grouptest.vcproj | 16 +- windows/examples/grouptestdll/grouptestdll.vcproj | 16 +- .../intermgrouptest/intermgrouptest.vcproj | 16 +- .../intermgrouptestdll/intermgrouptestdll.vcproj | 16 +- windows/examples/readtest/readtest.vcproj | 16 +- windows/examples/readtestdll/readtestdll.vcproj | 16 +- windows/examples/selectest/selectest.vcproj | 16 +- windows/examples/selectestdll/selectestdll.vcproj | 16 +- windows/examples/writetest/writetest.vcproj | 16 +- windows/examples/writetestdll/writetestdll.vcproj | 16 +- .../test/libtest_cstubdll/libtest_cstubdll.vcproj | 24 +- .../test/libtest_fortran/libtest_cstub.vcproj | 16 +- .../hl_test_table_cpp/hl_test_table_cpp.vcproj | 16 +- .../hl_test_table_cppdll.vcproj | 16 +- windows/hl/examples/ex_ds1/ex_ds1.vcproj | 16 +- windows/hl/examples/ex_ds1dll/ex_ds1dll.vcproj | 16 +- windows/hl/examples/ex_image1/ex_image1.vcproj | 16 +- .../hl/examples/ex_image1dll/ex_image1dll.vcproj | 16 +- windows/hl/examples/ex_image2/ex_image2.vcproj | 8 +- .../hl/examples/ex_image2dll/ex_image2dll.vcproj | 8 +- windows/hl/examples/ex_lite1/ex_lite1.vcproj | 16 +- windows/hl/examples/ex_lite1dll/ex_lite1dll.vcproj | 16 +- windows/hl/examples/ex_lite2/ex_lite2.vcproj | 8 +- windows/hl/examples/ex_lite2dll/ex_lite2dll.vcproj | 8 +- windows/hl/examples/ex_lite3/ex_lite3.vcproj | 8 +- windows/hl/examples/ex_lite3dll/ex_lite3dll.vcproj | 8 +- windows/hl/examples/ex_table01/ex_table01.vcproj | 16 +- .../hl/examples/ex_table01dll/ex_table01dll.vcproj | 16 +- windows/hl/examples/ex_table02/ex_table02.vcproj | 8 +- .../hl/examples/ex_table02dll/ex_table02dll.vcproj | 8 +- windows/hl/examples/ex_table03/ex_table03.vcproj | 8 +- .../hl/examples/ex_table03dll/ex_table03dll.vcproj | 8 +- windows/hl/examples/ex_table04/ex_table04.vcproj | 8 +- .../hl/examples/ex_table04dll/ex_table04dll.vcproj | 8 +- windows/hl/examples/ex_table05/ex_table05.vcproj | 8 +- .../hl/examples/ex_table05dll/ex_table05dll.vcproj | 8 +- windows/hl/examples/ex_table06/ex_table06.vcproj | 8 +- .../hl/examples/ex_table06dll/ex_table06dll.vcproj | 8 +- windows/hl/examples/ex_table07/ex_table07.vcproj | 8 +- .../hl/examples/ex_table07dll/ex_table07dll.vcproj | 8 +- windows/hl/examples/ex_table08/ex_table08.vcproj | 8 +- .../hl/examples/ex_table08dll/ex_table08dll.vcproj | 8 +- windows/hl/examples/ex_table09/ex_table09.vcproj | 8 +- .../hl/examples/ex_table09dll/ex_table09dll.vcproj | 8 +- windows/hl/examples/ex_table10/ex_table10.vcproj | 8 +- .../hl/examples/ex_table10dll/ex_table10dll.vcproj | 8 +- windows/hl/examples/ex_table11/ex_table11.vcproj | 8 +- .../hl/examples/ex_table11dll/ex_table11dll.vcproj | 8 +- windows/hl/examples/ex_table12/ex_table12.vcproj | 8 +- .../hl/examples/ex_table12dll/ex_table12dll.vcproj | 8 +- windows/hl/examples/ptExampleFL/ptExampleFL.vcproj | 16 +- .../examples/ptExampleFLdll/ptExampleFLdll.vcproj | 16 +- windows/hl/examples/ptExampleVL/ptExampleVL.vcproj | 8 +- .../examples/ptExampleVLdll/ptExampleVLdll.vcproj | 8 +- windows/hl/test/hl_test_ds/hl_test_ds.vcproj | 16 +- windows/hl/test/hl_test_dsdll/hl_test_dsdll.vcproj | 16 +- windows/hl/test/hl_test_image/hl_test_image.vcproj | 16 +- .../test/hl_test_imagedll/hl_test_imagedll.vcproj | 16 +- windows/hl/test/hl_test_lite/hl_test_lite.vcproj | 16 +- .../hl/test/hl_test_litedll/hl_test_litedll.vcproj | 16 +- .../hl/test/hl_test_packet/hl_test_packet.vcproj | 16 +- .../hl_test_packetdll/hl_test_packetdll.vcproj | 16 +- windows/hl/test/hl_test_table/hl_test_table.vcproj | 16 +- .../test/hl_test_tabledll/hl_test_tabledll.vcproj | 16 +- windows/hl/tools/gifconv/gif2h5.vcproj | 16 +- windows/hl/tools/gifconv/h52gif.vcproj | 16 +- windows/hl/tools/gifconvdll/gif2h5dll.vcproj | 16 +- windows/hl/tools/gifconvdll/h52gifdll.vcproj | 16 +- .../typegen/h5libsettings/h5libsettings.vcproj | 399 +++++++++++++++++++++ .../typegen/h5match_types/h5match_types.vcproj | 16 +- windows/misc/typegen/h5tinit/h5tinit.vcproj | 16 +- windows/perform/perf_serial/perf_serial.vcproj | 16 +- .../perform/perf_serialdll/perf_serialdll.vcproj | 16 +- windows/proj/hdf5/hdf5.vcproj | 8 +- windows/proj/hdf5_cpp/hdf5_cpp.vcproj | 16 +- windows/proj/hdf5_cppdll/hdf5_cppdll.vcproj | 24 +- windows/proj/hdf5_f90cstub/hdf5_f90cstub.vcproj | 16 +- .../proj/hdf5_f90cstubdll/hdf5_f90cstubdll.vcproj | 24 +- windows/proj/hdf5_hl/hdf5_hl.vcproj | 16 +- windows/proj/hdf5_hl_cpp/hdf5_hl_cpp.vcproj | 16 +- windows/proj/hdf5_hl_cppdll/hdf5_hl_cppdll.vcproj | 24 +- .../hdf5_hl_f90cstubdll/hdf5_hl_f90cstubdll.vcproj | 24 +- .../proj/hdf5_hl_fortran/hdf5_hl_f90cstub.vcproj | 48 +-- windows/proj/hdf5_hldll/hdf5_hldll.vcproj | 24 +- windows/proj/hdf5dll/hdf5dll.vcproj | 24 +- windows/test/app_ref/app_ref.vcproj | 8 +- windows/test/app_refdll/app_refdll.vcproj | 8 +- windows/test/big/big.vcproj | 16 +- windows/test/bigdll/bigdll.vcproj | 16 +- windows/test/bittests/bittests.vcproj | 16 +- windows/test/bittestsdll/bittestsdll.vcproj | 16 +- windows/test/btree2/btree2.vcproj | 16 +- windows/test/btree2dll/btree2dll.vcproj | 16 +- windows/test/cache/cache.vcproj | 16 +- windows/test/cache_api/cache_api.vcproj | 16 +- windows/test/cache_apidll/cache_apidll.vcproj | 16 +- windows/test/cachedll/cachedll.vcproj | 16 +- windows/test/chunk/chunk.vcproj | 16 +- windows/test/chunk_info/chunk_info.vcproj | 8 +- windows/test/chunk_infodll/chunk_infodll.vcproj | 8 +- windows/test/chunkdll/chunkdll.vcproj | 16 +- windows/test/cmpd_dset/cmpd_dset.vcproj | 16 +- windows/test/cmpd_dsetdll/cmpd_dsetdll.vcproj | 16 +- windows/test/cross_read/cross_read.vcproj | 16 +- windows/test/cross_readdll/cross_readdll.vcproj | 16 +- windows/test/dangle/dangle.vcproj | 16 +- windows/test/dangledll/dangledll.vcproj | 16 +- windows/test/dsets/dsets.vcproj | 16 +- windows/test/dsetsdll/dsetsdll.vcproj | 16 +- windows/test/dt_arith/dt_arith.vcproj | 16 +- windows/test/dt_arithdll/dt_arithdll.vcproj | 16 +- windows/test/dtransform/dtransform.vcproj | 16 +- windows/test/dtransformdll/dtransformdll.vcproj | 16 +- windows/test/dtypes/dtypes.vcproj | 16 +- windows/test/dtypesdll/dtypesdll.vcproj | 16 +- windows/test/earray/earray.vcproj | 8 +- windows/test/earraydll/earraydll.vcproj | 8 +- windows/test/enum/enum.vcproj | 16 +- windows/test/enumdll/enumdll.vcproj | 16 +- windows/test/err_compat/err_compat.vcproj | 16 +- windows/test/err_compatdll/err_compatdll.vcproj | 16 +- windows/test/error_test/error_test.vcproj | 16 +- windows/test/error_testdll/error_testdll.vcproj | 16 +- windows/test/extend/extend.vcproj | 16 +- windows/test/extenddll/extenddll.vcproj | 16 +- windows/test/external/external.vcproj | 16 +- windows/test/externaldll/externaldll.vcproj | 16 +- windows/test/farray/farray.vcproj | 8 +- windows/test/farraydll/farraydll.vcproj | 8 +- windows/test/fheap/fheap.vcproj | 16 +- windows/test/fheapdll/fheapdll.vcproj | 16 +- windows/test/fillval/fillval.vcproj | 16 +- windows/test/fillvaldll/fillvaldll.vcproj | 16 +- windows/test/flush1/flush1.vcproj | 16 +- windows/test/flush1dll/flush1dll.vcproj | 16 +- windows/test/flush2/flush2.vcproj | 16 +- windows/test/flush2dll/flush2dll.vcproj | 16 +- windows/test/freespace/freespace.vcproj | 8 +- windows/test/freespacedll/freespacedll.vcproj | 8 +- windows/test/getname/getname.vcproj | 16 +- windows/test/getnamedll/getnamedll.vcproj | 16 +- windows/test/getub/getub.vcproj | 16 +- windows/test/gheap/gheap.vcproj | 16 +- windows/test/gheapdll/gheapdll.vcproj | 16 +- windows/test/hyperslab/hyperslab.vcproj | 16 +- windows/test/hyperslabdll/hyperslabdll.vcproj | 16 +- windows/test/iopipe/iopipe.vcproj | 16 +- windows/test/iopipedll/iopipedll.vcproj | 16 +- windows/test/istore/istore.vcproj | 16 +- windows/test/istoredll/istoredll.vcproj | 16 +- windows/test/lheap/lheap.vcproj | 16 +- windows/test/lheapdll/lheapdll.vcproj | 16 +- windows/test/libtest/libtest.vcproj | 16 +- windows/test/libtestdll/libtestdll.vcproj | 24 +- windows/test/links/links.vcproj | 16 +- windows/test/linksdll/linksdll.vcproj | 16 +- windows/test/mf/mf.vcproj | 8 +- windows/test/mfdll/mfdll.vcproj | 8 +- windows/test/mount/mount.vcproj | 16 +- windows/test/mountdll/mountdll.vcproj | 16 +- windows/test/mtime/mtime.vcproj | 16 +- windows/test/mtimedll/mtimedll.vcproj | 16 +- windows/test/ntypes/ntypes.vcproj | 16 +- windows/test/ntypesdll/ntypesdll.vcproj | 16 +- windows/test/objcopy/objcopy.vcproj | 16 +- windows/test/objcopydll/objcopydll.vcproj | 16 +- windows/test/ohdr/ohdr.vcproj | 16 +- windows/test/ohdrdll/ohdrdll.vcproj | 16 +- windows/test/overhead/overhead.vcproj | 16 +- windows/test/overheaddll/overheaddll.vcproj | 16 +- windows/test/pool/pool.vcproj | 16 +- windows/test/pooldll/pooldll.vcproj | 16 +- windows/test/reserved/reserved.vcproj | 16 +- windows/test/reserveddll/reserveddll.vcproj | 16 +- windows/test/set_extent/set_extent.vcproj | 16 +- windows/test/set_extentdll/set_extentdll.vcproj | 16 +- windows/test/stab/stab.vcproj | 16 +- windows/test/stabdll/stabdll.vcproj | 16 +- windows/test/tcheckversion/tcheckversion.vcproj | 16 +- .../test/tcheckversiondll/tcheckversiondll.vcproj | 16 +- windows/test/tellub/tellub.vcproj | 16 +- windows/test/testhdf5/testhdf5.vcproj | 16 +- windows/test/testhdf5dll/testhdf5dll.vcproj | 16 +- windows/test/ttsafedll/ttsafedll.vcproj | 16 +- windows/test/unlink/unlink.vcproj | 16 +- windows/test/unlinkdll/unlinkdll.vcproj | 16 +- windows/test/vfd/vfd.vcproj | 16 +- windows/test/vfddll/vfddll.vcproj | 16 +- windows/tools/h5copy/h5copy.vcproj | 16 +- windows/tools/h5debug/h5debug.vcproj | 16 +- windows/tools/h5debugdll/h5debugdll.vcproj | 16 +- windows/tools/h5diff/h5diff.vcproj | 16 +- windows/tools/h5diffdll/h5diffdll.vcproj | 16 +- windows/tools/h5dump/h5dump.vcproj | 16 +- windows/tools/h5dumpdll/h5dumpdll.vcproj | 16 +- windows/tools/h5import/h5import.vcproj | 16 +- windows/tools/h5importdll/h5importdll.vcproj | 16 +- windows/tools/h5jam/h5jam.vcproj | 16 +- windows/tools/h5ls/h5ls.vcproj | 16 +- windows/tools/h5lsdll/h5lsdll.vcproj | 16 +- windows/tools/h5mkgrp/h5mkgrp.vcproj | 16 +- windows/tools/h5repack/h5repack.vcproj | 16 +- windows/tools/h5repackdll/h5repackdll.vcproj | 16 +- windows/tools/h5repart/h5repart.vcproj | 16 +- windows/tools/h5repartdll/h5repartdll.vcproj | 16 +- windows/tools/h5stat/h5stat.vcproj | 16 +- windows/tools/h5statdll/h5statdll.vcproj | 16 +- windows/tools/h5unjam/h5unjam.vcproj | 16 +- windows/tools/talign/talign.vcproj | 16 +- windows/tools/taligndll/taligndll.vcproj | 16 +- windows/tools/testfiles/binread/binread.vcproj | 16 +- windows/tools/testfiles/h5difftst/h5difftst.vcproj | 16 +- windows/tools/testfiles/h5dumptst/h5dumptst.vcproj | 16 +- .../tools/testfiles/h5importtst/h5importtst.vcproj | 16 +- windows/tools/testfiles/h5jamtst/h5jamtst.vcproj | 16 +- .../tools/testfiles/h5repacktst/h5repacktst.vcproj | 16 +- .../h5repart_gentest/h5repart_gentest.vcproj | 16 +- .../tools/testfiles/h5reparttst/h5reparttst.vcproj | 16 +- .../testh5repack_detect_szip.vcproj | 16 +- .../testh5repack_detect_szipdll.vcproj | 16 +- windows/tools/toolslib/toolslib.vcproj | 8 +- windows/tools/toolslibdll/toolslibdll.vcproj | 8 +- 247 files changed, 2232 insertions(+), 1833 deletions(-) create mode 100644 windows/misc/typegen/h5libsettings/h5libsettings.vcproj diff --git a/windows/c++/examples/chunkstest/chunkstest.vcproj b/windows/c++/examples/chunkstest/chunkstest.vcproj index 2a028d1..7a59a0a 100644 --- a/windows/c++/examples/chunkstest/chunkstest.vcproj +++ b/windows/c++/examples/chunkstest/chunkstest.vcproj @@ -49,7 +49,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..\..\c++\src,..\..\..\..\src" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;NDEBUG;_CONSOLE" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -67,7 +67,7 @@ /> nul copy /y fortran\src\H5fortran_types.f90 ..\fortran\src > nul xcopy /s /i /y *.bat ..\ > nul copy /y examples\testExamples_exp_output.txt ..\examples > nul -copy /y c++\test\H5srcdir.h ..\src > nul -copy /y hl\test\H5srcdir.h ..\src > nul -copy /y perform\H5srcdir.h ..\src > nul -copy /y test\H5srcdir.h ..\src > nul -copy /y tools\h5repack\H5srcdir.h ..\src > nul +copy /y c++\test\H5srcdir.h ..\c++\test > nul +copy /y hl\test\H5srcdir.h ..\hl\test > nul +copy /y perform\H5srcdir.h ..\perform > nul +copy /y test\H5srcdir.h ..\test > nul +copy /y tools\h5repack\H5srcdir.h ..\tools\h5repack > nul popd diff --git a/windows/examples/attributetest/attributetest.vcproj b/windows/examples/attributetest/attributetest.vcproj index 8a990ae..ea4c49d 100644 --- a/windows/examples/attributetest/attributetest.vcproj +++ b/windows/examples/attributetest/attributetest.vcproj @@ -48,7 +48,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\src" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE" RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\../../../examples/attributest/Debug/attributetest.pch" @@ -65,7 +65,7 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/misc/typegen/h5match_types/h5match_types.vcproj b/windows/misc/typegen/h5match_types/h5match_types.vcproj index 1f3d0d3..1bad059 100644 --- a/windows/misc/typegen/h5match_types/h5match_types.vcproj +++ b/windows/misc/typegen/h5match_types/h5match_types.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../fortran/src,../../../../src" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" @@ -67,7 +67,7 @@ /> @@ -364,7 +364,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" BasicRuntimeChecks="3" /> @@ -379,7 +379,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" /> @@ -410,7 +410,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" BasicRuntimeChecks="3" /> @@ -425,7 +425,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" /> @@ -456,7 +456,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" BasicRuntimeChecks="3" /> @@ -471,7 +471,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" /> @@ -502,7 +502,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="BIND_TO_CURRENT_VCLIBS_VERSION=1;" BasicRuntimeChecks="3" /> diff --git a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj index 6141d11..91554f2 100644 --- a/windows/proj/hdf5_hldll/hdf5_hldll.vcproj +++ b/windows/proj/hdf5_hldll/hdf5_hldll.vcproj @@ -42,7 +42,7 @@ />