diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-01-12 23:01:49 -0500 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-01-12 23:01:49 -0500 |
| commit | d2d1750e0802c1472419da1c73992eae92777d0f (patch) | |
| tree | 434843a22b8779861f4fc38735ef28e392b30dc0 | |
| parent | e8b38f899c792565de4bbb09b14f7962d441faee (diff) | |
| download | freetype-d2d1750e0802c1472419da1c73992eae92777d0f.tar.gz | |
[build] Expand dllexport/dllimport to Cygwin/MinGW.
* include/freetype/config/ftconfig.h: Respect DLL_EXPORT,
s/_MSC_VER/_WIN32/.
* builds/unix/ftconfig.in: Replicate here.
* builds/vms/ftconfig.h: Replicate here.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | builds/unix/ftconfig.in | 11 | ||||
| -rw-r--r-- | builds/vms/ftconfig.h | 11 | ||||
| -rw-r--r-- | include/freetype/config/ftconfig.h | 5 |
4 files changed, 34 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2018-01-12 Alexei Podtelezhnikov <apodtele@gmail.com> + [build] Expand dllexport/dllimport to Cygwin/MinGW. + + * include/freetype/config/ftconfig.h: Respect DLL_EXPORT, + s/_MSC_VER/_WIN32/. + * builds/unix/ftconfig.in: Replicate here. + * builds/vms/ftconfig.h: Replicate here. + +2018-01-12 Alexei Podtelezhnikov <apodtele@gmail.com> + [build] Improve and document MSVC build. * include/freetype/config/ftconfig.h: Guard dllexport/dllimport diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 5159693e7..ca9058834 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -493,6 +493,17 @@ FT_BEGIN_HEADER #define FT_EXPORT( x ) extern x #endif +#ifdef _WIN32 +#if defined( FT2_BUILD_LIBRARY ) && \ + ( defined( _DLL ) || defined( DLL_EXPORT ) ) +#undef FT_EXPORT +#define FT_EXPORT( x ) __declspec( dllexport ) x +#elif defined( FT2_DLLIMPORT ) +#undef FT_EXPORT +#define FT_EXPORT( x ) __declspec( dllimport ) x +#endif +#endif + #endif /* !FT_EXPORT */ diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index fa4aa1198..d87ea69c3 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -445,6 +445,17 @@ FT_BEGIN_HEADER #define FT_EXPORT( x ) extern x #endif +#ifdef _WIN32 +#if defined( FT2_BUILD_LIBRARY ) && \ + ( defined( _DLL ) || defined( DLL_EXPORT ) ) +#undef FT_EXPORT +#define FT_EXPORT( x ) __declspec( dllexport ) x +#elif defined( FT2_DLLIMPORT ) +#undef FT_EXPORT +#define FT_EXPORT( x ) __declspec( dllimport ) x +#endif +#endif + #endif /* !FT_EXPORT */ diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 009c70f18..8ff143ea3 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -461,8 +461,9 @@ FT_BEGIN_HEADER #define FT_EXPORT( x ) extern x #endif -#ifdef _MSC_VER -#if defined( FT2_BUILD_LIBRARY ) && defined( _DLL ) +#ifdef _WIN32 +#if defined( FT2_BUILD_LIBRARY ) && \ + ( defined( _DLL ) || defined( DLL_EXPORT ) ) #undef FT_EXPORT #define FT_EXPORT( x ) __declspec( dllexport ) x #elif defined( FT2_DLLIMPORT ) |