diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-12-30 14:03:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-12-30 14:03:15 (GMT) |
| commit | 8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4 (patch) | |
| tree | af334956696330b4ce9811ca890d41bfd44770e2 /src/H5api_adpt.h | |
| parent | a863723db866ed63377aecd1e90cffa08f43c020 (diff) | |
| download | hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.zip hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.tar.gz hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.tar.bz2 | |
[svn-r19898] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries.
Diffstat (limited to 'src/H5api_adpt.h')
| -rw-r--r-- | src/H5api_adpt.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h index 1bfb3bd..6e02e28 100644 --- a/src/H5api_adpt.h +++ b/src/H5api_adpt.h @@ -235,7 +235,7 @@ #define H5_FCDLLVAR extern #endif /* H5_FCDLL */ -#if defined(hdf5_f90Ctest_EXPORTS) +#if defined(hdf5_test_f90cstub_EXPORTS) #if defined (_MSC_VER) /* MSVC Compiler Case */ #define H5_FCTESTDLL __declspec(dllexport) #define H5_FCTESTDLLVAR extern __declspec(dllexport) @@ -281,6 +281,22 @@ #define HDF5_HL_F90CSTUBDLLVAR extern #endif /* HDF5_HL_F90CSTUBDLL */ +#elif (H5_BUILT_AS_STATIC_LIB) + #define H5_DLL + #define H5_HLDLL + #define H5_HLCPPDLL + #define HDF5_HL_F90CSTUBDLL + #define H5_DLLVAR extern + #define H5_DLLCPP + #define H5TEST_DLL + #define H5TEST_DLLVAR extern + #define H5TOOLS_DLL + #define H5TOOLS_DLLVAR extern + #define H5_FCDLL + #define H5_FCDLLVAR extern + #define H5_FCTESTDLL + #define H5_FCTESTDLLVAR extern + #else /* This is the original HDFGroup defined preprocessor code which should still work * with the VS projects that are maintained by "The HDF Group" |