diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 19:55:47 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 19:55:47 (GMT) |
| commit | f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a (patch) | |
| tree | 72ddbeae8bd36de5762dc45f867672a93d1c37aa /windows_vnet/proj | |
| parent | 8a75f17670000b64440890e710b2f9053d2ae31e (diff) | |
| download | hdf5-f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a.zip hdf5-f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a.tar.gz hdf5-f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a.tar.bz2 | |
[svn-r15234] Description:
Bring revisions 14800:14900 from trunk into metadata journaling branch
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'windows_vnet/proj')
| -rw-r--r-- | windows_vnet/proj/all/all.sln | 42 | ||||
| -rw-r--r-- | windows_vnet/proj/hdf5/hdf5.vcproj | 6 | ||||
| -rw-r--r-- | windows_vnet/proj/hdf5dll/hdf5dll.vcproj | 6 |
3 files changed, 40 insertions, 14 deletions
diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln index 980c93e..1666237 100644 --- a/windows_vnet/proj/all/all.sln +++ b/windows_vnet/proj/all/all.sln @@ -17,7 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcproj", "{BF2DE {102AD40C-F194-45AE-BF39-D7DD249E9BEE} = {102AD40C-F194-45AE-BF39-D7DD249E9BEE}
{44908A0D-6D59-44EC-8E98-290367C74FA4} = {44908A0D-6D59-44EC-8E98-290367C74FA4}
{4DA38C0D-62F9-487F-B469-2C822A52D329} = {4DA38C0D-62F9-487F-B469-2C822A52D329}
- {7F5E4B11-2464-4902-94B8-444B85200ED6} = {7F5E4B11-2464-4902-94B8-444B85200ED6}
{7A076512-49AF-475E-B4B3-FE5ECF08A51C} = {7A076512-49AF-475E-B4B3-FE5ECF08A51C}
{651D8414-0037-41E9-B5D9-C66199430492} = {651D8414-0037-41E9-B5D9-C66199430492}
{BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
@@ -890,11 +889,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr", "..\..\test\ohdr\ohd {76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdr_gentst", "..\..\TEST\ohdr_gentst\ohdr_gentst.vcproj", "{7F5E4B11-2464-4902-94B8-444B85200ED6}"
- ProjectSection(ProjectDependencies) = postProject
- {BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohdrdll", "..\..\test\ohdrdll\ohdrdll.vcproj", "{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}"
ProjectSection(ProjectDependencies) = postProject
{605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
@@ -1051,6 +1045,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfddll", "..\..\TEST\vfddll {B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_infodll", "..\..\test\chunk_infodll\chunk_infodll.vcproj", "{4E8449CA-3833-49AA-B12E-7A59BA6A2D14}"
+ ProjectSection(ProjectDependencies) = postProject
+ {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6} = {605B6189-1BA4-4DC5-84E4-4F2A2A2891D6}
+ {B5D88BF3-5F9B-49CC-A677-BF4D364F1163} = {B5D88BF3-5F9B-49CC-A677-BF4D364F1163}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chunk_info", "..\..\test\chunk_info\chunk_info.vcproj", "{F99F5FC8-29C2-407E-BC74-AB2623686017}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
+ {76D3767E-4FB1-4348-B17E-3621DD5712EE} = {76D3767E-4FB1-4348-B17E-3621DD5712EE}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
AlphaDbg = AlphaDbg
@@ -2069,14 +2075,6 @@ Global {1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Debug.Build.0 = Debug|Win32
{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Release.ActiveCfg = Release|Win32
{1AC44D77-3A06-4122-B6AF-0D070F33AE6E}.Release.Build.0 = Release|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaDbg.ActiveCfg = Debug|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaDbg.Build.0 = Debug|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaRel.ActiveCfg = Debug|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.AlphaRel.Build.0 = Debug|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.Debug.ActiveCfg = Debug|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.Debug.Build.0 = Debug|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.Release.ActiveCfg = Release|Win32
- {7F5E4B11-2464-4902-94B8-444B85200ED6}.Release.Build.0 = Release|Win32
{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaDbg.ActiveCfg = AlphaDbg|Win32
{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaDbg.Build.0 = AlphaDbg|Win32
{04C9D706-6430-4DAC-9BCC-6AF90F7C9F36}.AlphaRel.ActiveCfg = AlphaRel|Win32
@@ -2293,6 +2291,22 @@ Global {4DA38C0D-62F9-487F-B469-2C822A52D329}.Debug.Build.0 = Debug|Win32
{4DA38C0D-62F9-487F-B469-2C822A52D329}.Release.ActiveCfg = Release|Win32
{4DA38C0D-62F9-487F-B469-2C822A52D329}.Release.Build.0 = Release|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaDbg.ActiveCfg = Release|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaDbg.Build.0 = Release|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaRel.ActiveCfg = Release|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.AlphaRel.Build.0 = Release|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Debug.ActiveCfg = Debug|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Debug.Build.0 = Debug|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Release.ActiveCfg = Release|Win32
+ {4E8449CA-3833-49AA-B12E-7A59BA6A2D14}.Release.Build.0 = Release|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaDbg.ActiveCfg = Release|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaDbg.Build.0 = Release|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaRel.ActiveCfg = Release|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.AlphaRel.Build.0 = Release|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.Debug.ActiveCfg = Debug|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.Debug.Build.0 = Debug|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.Release.ActiveCfg = Release|Win32
+ {F99F5FC8-29C2-407E-BC74-AB2623686017}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
diff --git a/windows_vnet/proj/hdf5/hdf5.vcproj b/windows_vnet/proj/hdf5/hdf5.vcproj index ac8581d..c02068c 100644 --- a/windows_vnet/proj/hdf5/hdf5.vcproj +++ b/windows_vnet/proj/hdf5/hdf5.vcproj @@ -922,6 +922,9 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5Dchunk.c">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Dcompact.c">
<FileConfiguration
Name="Debug|Win32">
@@ -1319,6 +1322,9 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5Dscatgath.c">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Dselect.c">
<FileConfiguration
Name="Debug|Win32">
diff --git a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj index f4d83a9..23debef 100644 --- a/windows_vnet/proj/hdf5dll/hdf5dll.vcproj +++ b/windows_vnet/proj/hdf5dll/hdf5dll.vcproj @@ -973,6 +973,9 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5Dchunk.c">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Dcompact.c">
<FileConfiguration
Name="Debug|Win32">
@@ -1371,6 +1374,9 @@ </FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\src\H5Dscatgath.c">
+ </File>
+ <File
RelativePath="..\..\..\src\H5Dselect.c">
<FileConfiguration
Name="Debug|Win32">
|