Khaled Hosny
c88d615db8
The FreeType/fontconfig font backend was spread over three directories mostly for historical reasons. Lets clean this up and consolidate it under one directory. helper.cxx holds the psp path helpers, so it goes to print/ next to the rest of the printing code. Change-Id: I67d20e3e4bdf71d978a79e672bb31d3dd1460595 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208522 Tested-by: Jenkins Reviewed-by: Khaled Hosny <khaled@libreoffice.org>
24 lines
913 B
Diff
24 lines
913 B
Diff
When building for CODA-W, we build freetype as a static library, and
|
|
we don't define DLL_EXPORT as there in general is no need to export
|
|
freetype symbols from the (dynamkic) library that freetype gets linked
|
|
into, cairo.dll and vcllo.dll (or mergedlo.dll). But there is one
|
|
exception: FT_Done_MM_Var *must* be exported as the code in
|
|
dlFT_Done_MM_Var() in vcl/unx/generic/font/freetype_glyphcache.cxx
|
|
wants to look it up and call it.
|
|
|
|
--- include/freetype/ftmm.h
|
|
+++ include/freetype/ftmm.h
|
|
@@ -400,7 +400,12 @@
|
|
* @return:
|
|
* FreeType error code. 0~means success.
|
|
*/
|
|
+#if defined( _WIN32 ) && defined( FT2_BUILD_LIBRARY ) && !defined( DLL_EXPORT )
|
|
+ /* FT_EXPORT is defined as a no-op but for CODA-W we *must* export FT_Done_MM_Var */
|
|
+ __declspec( dllexport ) FT_Error
|
|
+#else
|
|
FT_EXPORT( FT_Error )
|
|
+#endif
|
|
FT_Done_MM_Var( FT_Library library,
|
|
FT_MM_Var *amaster );
|
|
|