[build] Improve and document MSVC build.

* include/freetype/config/ftconfig.h: Guard dllexport/dllimport
attributes with _DLL and FT2_DLLIMPORT.
* builds/windows/vc2010/index.html: Update documentation.
This commit is contained in:
Alexei Podtelezhnikov 2018-01-12 08:57:08 -05:00
parent 707cd028b2
commit e8b38f899c
3 changed files with 25 additions and 28 deletions

View File

@ -1,3 +1,11 @@
2018-01-12 Alexei Podtelezhnikov <apodtele@gmail.com>
[build] Improve and document MSVC build.
* include/freetype/config/ftconfig.h: Guard dllexport/dllimport
attributes with _DLL and FT2_DLLIMPORT.
* builds/windows/vc2010/index.html: Update documentation.
2018-01-10 Steve Robinson <ssrobins@gmail.com>
* CMakeLists.txt [win32]: Suppress warnings for POSIX functions.

View File

@ -1,42 +1,26 @@
<html>
<header>
<title>
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
FreeType&nbsp;2 Project Files for Visual&nbsp;C++&nbsp;2010 or newer
</title>
<body>
<h1>
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
FreeType&nbsp;2 Project Files for Visual&nbsp;C++&nbsp;2010 or newer
</h1>
<p>This directory contains a project file for Visual C++ (VS.NET&nbsp;2010
or newer), named <tt>freetype.vcxproj</tt>, and Visual Studio, called
<tt>freetype.sln</tt>. It compiles the following libraries from the
FreeType 2.9 sources:</p>
<p>This directory contains solution and project files for
Visual&nbsp;C++&nbsp;2010 or newer, named <tt>freetype.sln</tt>,
and <tt>freetype.vcxproj</tt>. It compiles the following libraries
from the FreeType 2.9 sources:</p>
<ul>
<pre>
freetype29.lib - release build
freetype29d.lib - debug build
freetype29ST.lib - release build; single threaded
freetype29STd.lib - debug build; single threaded
freetype29MT.lib - release build; multi-threaded
freetype29MTd.lib - debug build; multi-threaded</pre>
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
<li>freetype.lib using 'Release Static' or 'Debug Static' configurations</li>
</ul>
<p>Both Win32 and x64 builds are supported.</p>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
archives are already stored this way, so no further action is required. If
you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
tool to convert the line endings. For example, with <a
href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
file smart CR/LF Conversion</em> option. Alternatively, you may consider
using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
around, which specifically deal with this particular problem.
<p>Build directories are placed in the top-level <tt>objs\vc2010</tt>
directory.</p>
<p>Both Win32 and x64 builds are supported. Build directories and target
files are placed in the top-level <tt>objs</tt> directory.</p>
<p>Customization of the FreeType library is done by editing the
<tt>ftoption.h</tt> header file in the top-level <tt>devel</tt> path.
@ -48,5 +32,9 @@ edit the <tt>freetype.users.props</tt> file in this directory. It also
simplifies automated (command-line) builds using <a
href="http://msdn.microsoft.com/library/dd393574%28v=vs.100%29.aspx">msbuild</a>.</p>
<p>To link your executable with FreeType DLL, you may want to define
FT2_DLLIMPORT so that the imported functions are appropriately
attributed with <tt>dllimport<tt>.</p>
</body>
</html>

View File

@ -462,10 +462,11 @@ FT_BEGIN_HEADER
#endif
#ifdef _MSC_VER
#if defined( FT2_BUILD_LIBRARY ) && defined( _DLL )
#undef FT_EXPORT
#ifdef _DLL
#define FT_EXPORT( x ) __declspec( dllexport ) x
#else
#elif defined( FT2_DLLIMPORT )
#undef FT_EXPORT
#define FT_EXPORT( x ) __declspec( dllimport ) x
#endif
#endif