freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master d2d1750: [build] Expand dllexport/dllimport to Cygwin


From: Alexei Podtelezhnikov
Subject: [freetype2] master d2d1750: [build] Expand dllexport/dllimport to Cygwin/MinGW.
Date: Fri, 12 Jan 2018 23:02:49 -0500 (EST)

branch: master
commit d2d1750e0802c1472419da1c73992eae92777d0f
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [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.
---
 ChangeLog                          |  9 +++++++++
 builds/unix/ftconfig.in            | 11 +++++++++++
 builds/vms/ftconfig.h              | 11 +++++++++++
 include/freetype/config/ftconfig.h |  5 +++--
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab6d421..6e1a0f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2018-01-12  Alexei Podtelezhnikov  <address@hidden>
 
+       [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  <address@hidden>
+
        [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 5159693..ca90588 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 fa4aa11..d87ea69 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 009c70f..8ff143e 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 )



reply via email to

[Prev in Thread] Current Thread [Next in Thread]