forked from minhngoc25a/freetype2
[build] Fix DLL builds in Visual C++ project.
* build/windows/vc2010/freetype.vcxproj: Use DynamicLibrary in Debug and Release configurations. * include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF) [_DLL]: Use Visual C++ extensions.
This commit is contained in:
parent
b00be9f609
commit
74f442394f
|
@ -1,3 +1,12 @@
|
||||||
|
2017-09-19 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
|
[build] Fix DLL builds in Visual C++ project.
|
||||||
|
|
||||||
|
* build/windows/vc2010/freetype.vcxproj: Use DynamicLibrary in Debug
|
||||||
|
and Release configurations.
|
||||||
|
* include/freetype/config/ftconfig.h (FT_EXPORT, FT_EXPORT_DEF)
|
||||||
|
[_DLL]: Use Visual C++ extensions.
|
||||||
|
|
||||||
2017-09-19 John Tytgat <John.Tytgat@esko.com>
|
2017-09-19 John Tytgat <John.Tytgat@esko.com>
|
||||||
|
|
||||||
[cff] Fix family name logic of pure CFF fontdata (#52056).
|
[cff] Fix family name logic of pure CFF fontdata (#52056).
|
||||||
|
|
|
@ -81,12 +81,12 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseOfMfc>false</UseOfMfc>
|
<UseOfMfc>false</UseOfMfc>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseOfMfc>false</UseOfMfc>
|
<UseOfMfc>false</UseOfMfc>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -111,12 +111,12 @@
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseOfMfc>false</UseOfMfc>
|
<UseOfMfc>false</UseOfMfc>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
<UseOfMfc>false</UseOfMfc>
|
<UseOfMfc>false</UseOfMfc>
|
||||||
<CharacterSet>MultiByte</CharacterSet>
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -268,48 +268,6 @@ FT_BEGIN_HEADER
|
||||||
#define FT_CONFIG_OPTION_USE_HARFBUZZ
|
#define FT_CONFIG_OPTION_USE_HARFBUZZ
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
|
||||||
/* */
|
|
||||||
/* DLL export compilation */
|
|
||||||
/* */
|
|
||||||
/* When compiling FreeType as a DLL, some systems/compilers need a */
|
|
||||||
/* special keyword in front OR after the return type of function */
|
|
||||||
/* declarations. */
|
|
||||||
/* */
|
|
||||||
/* Two macros are used within the FreeType source code to define */
|
|
||||||
/* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT( return_type ) */
|
|
||||||
/* */
|
|
||||||
/* is used in a function declaration, as in */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT( FT_Error ) */
|
|
||||||
/* FT_Init_FreeType( FT_Library* alibrary ); */
|
|
||||||
/* */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT_DEF( return_type ) */
|
|
||||||
/* */
|
|
||||||
/* is used in a function definition, as in */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT_DEF( FT_Error ) */
|
|
||||||
/* FT_Init_FreeType( FT_Library* alibrary ) */
|
|
||||||
/* { */
|
|
||||||
/* ... some code ... */
|
|
||||||
/* return FT_Err_Ok; */
|
|
||||||
/* } */
|
|
||||||
/* */
|
|
||||||
/* You can provide your own implementation of FT_EXPORT and */
|
|
||||||
/* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
|
|
||||||
/* will be later automatically defined as `extern return_type' to */
|
|
||||||
/* allow normal compilation. */
|
|
||||||
/* */
|
|
||||||
/* Do not #undef these macros here since the build system might define */
|
|
||||||
/* them for certain configurations only. */
|
|
||||||
/* */
|
|
||||||
/* #define FT_EXPORT(x) extern x */
|
|
||||||
/* #define FT_EXPORT_DEF(x) x */
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
/* */
|
/* */
|
||||||
/* Glyph Postscript Names handling */
|
/* Glyph Postscript Names handling */
|
||||||
|
|
|
@ -410,7 +410,9 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
#ifndef FT_EXPORT
|
#ifndef FT_EXPORT
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#if defined( _DLL )
|
||||||
|
#define FT_EXPORT( x ) __declspec(dllexport) x
|
||||||
|
#elif defined( __cplusplus )
|
||||||
#define FT_EXPORT( x ) extern "C" x
|
#define FT_EXPORT( x ) extern "C" x
|
||||||
#else
|
#else
|
||||||
#define FT_EXPORT( x ) extern x
|
#define FT_EXPORT( x ) extern x
|
||||||
|
@ -421,7 +423,9 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
#ifndef FT_EXPORT_DEF
|
#ifndef FT_EXPORT_DEF
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#if defined( _DLL )
|
||||||
|
#define FT_EXPORT_DEF( x ) __declspec(dllexport) x
|
||||||
|
#elif defined( __cplusplus )
|
||||||
#define FT_EXPORT_DEF( x ) extern "C" x
|
#define FT_EXPORT_DEF( x ) extern "C" x
|
||||||
#else
|
#else
|
||||||
#define FT_EXPORT_DEF( x ) extern x
|
#define FT_EXPORT_DEF( x ) extern x
|
||||||
|
|
|
@ -268,48 +268,6 @@ FT_BEGIN_HEADER
|
||||||
/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
|
/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
|
||||||
/* */
|
|
||||||
/* DLL export compilation */
|
|
||||||
/* */
|
|
||||||
/* When compiling FreeType as a DLL, some systems/compilers need a */
|
|
||||||
/* special keyword in front OR after the return type of function */
|
|
||||||
/* declarations. */
|
|
||||||
/* */
|
|
||||||
/* Two macros are used within the FreeType source code to define */
|
|
||||||
/* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT( return_type ) */
|
|
||||||
/* */
|
|
||||||
/* is used in a function declaration, as in */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT( FT_Error ) */
|
|
||||||
/* FT_Init_FreeType( FT_Library* alibrary ); */
|
|
||||||
/* */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT_DEF( return_type ) */
|
|
||||||
/* */
|
|
||||||
/* is used in a function definition, as in */
|
|
||||||
/* */
|
|
||||||
/* FT_EXPORT_DEF( FT_Error ) */
|
|
||||||
/* FT_Init_FreeType( FT_Library* alibrary ) */
|
|
||||||
/* { */
|
|
||||||
/* ... some code ... */
|
|
||||||
/* return FT_Err_Ok; */
|
|
||||||
/* } */
|
|
||||||
/* */
|
|
||||||
/* You can provide your own implementation of FT_EXPORT and */
|
|
||||||
/* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
|
|
||||||
/* will be later automatically defined as `extern return_type' to */
|
|
||||||
/* allow normal compilation. */
|
|
||||||
/* */
|
|
||||||
/* Do not #undef these macros here since the build system might define */
|
|
||||||
/* them for certain configurations only. */
|
|
||||||
/* */
|
|
||||||
/* #define FT_EXPORT(x) extern x */
|
|
||||||
/* #define FT_EXPORT_DEF(x) x */
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
/* */
|
/* */
|
||||||
/* Glyph Postscript Names handling */
|
/* Glyph Postscript Names handling */
|
||||||
|
|
Loading…
Reference in New Issue