[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.
This commit is contained in:
parent
e8b38f899c
commit
d2d1750e08
@ -1,3 +1,12 @@
|
||||
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.
|
||||
|
@ -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 */
|
||||
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
|
||||
|
@ -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 )
|
||||
|
Loading…
Reference in New Issue
Block a user