mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide support for x64 builds in Visual C++ project files.

Browse Source 
* src/builds/win32: Renamed to...
* src/builds/windows: This.

* src/builds/windows/vc2010/*: Updated to handle x64 target.

* src/builds/windows/*.mk, docs/INSTALL.GNU: s/win32/windows/ where
appropriate.
This commit is contained in:
Kenneth Miller 2013-10-23 20:10:56 +02:00 committed by Werner Lemberg
parent 1eb06e67a0
commit 4d87ac8a7f
35 changed files with 815 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2013-10-23 Kenneth Miller <kennethadammiller@yahoo.com>
Werner Lemberg <wl@gnu.org>
Provide support for x64 builds in Visual C++ project files.
* src/builds/win32: Renamed to...
* src/builds/windows: This.
* src/builds/windows/vc2010/*: Updated to handle x64 target.
* src/builds/windows/*.mk, docs/INSTALL.GNU: s/win32/windows/ where
appropriate.
2013-10-22 Werner Lemberg <wl@gnu.org>
* src/base/md5.c, src/base/md5.h: Updated to recent version.

0
builds/win32/.gitignore → builds/windows/.gitignore vendored
View File

0
builds/win32/detect.mk → builds/windows/detect.mk
View File

0
builds/win32/ftdebug.c → builds/windows/ftdebug.c
View File

0
builds/win32/vc2005/freetype.sln → builds/windows/vc2005/freetype.sln
View File

0
builds/win32/vc2005/freetype.vcproj → builds/windows/vc2005/freetype.vcproj
View File

0
builds/win32/vc2005/index.html → builds/windows/vc2005/index.html
View File

0
builds/win32/vc2008/freetype.sln → builds/windows/vc2008/freetype.sln
View File

0
builds/win32/vc2008/freetype.vcproj → builds/windows/vc2008/freetype.vcproj
View File

0
builds/win32/vc2008/index.html → builds/windows/vc2008/index.html
View File

20
builds/win32/vc2010/freetype.sln → builds/windows/vc2010/freetype.sln
View File

@ -1,30 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Multithreaded|Win32 = Debug Multithreaded|Win32
Debug Multithreaded|x64 = Debug Multithreaded|x64
Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32
Debug Singlethreaded|x64 = Debug Singlethreaded|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release Multithreaded|Win32 = Release Multithreaded|Win32
Release Multithreaded|x64 = Release Multithreaded|x64
Release Singlethreaded|Win32 = Release Singlethreaded|Win32
Release Singlethreaded|x64 = Release Singlethreaded|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Multithreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Multithreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

745
builds/win32/vc2010/freetype.vcxproj → builds/windows/vc2010/freetype.vcxproj
View File

File diff suppressed because it is too large Load Diff

0
builds/win32/vc2010/freetype.vcxproj.filters → builds/windows/vc2010/freetype.vcxproj.filters
View File

22
builds/win32/vc2010/index.html → builds/windows/vc2010/index.html
View File

@ -1,26 +1,30 @@
<html>
<header>
<title>
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
</title>
<body>
<h1>
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010
FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
</h1>
<p>This directory contains a project file for Visual C++, named
<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
compiles the following libraries from the FreeType 2.5.0 sources:</p>
<p>This directory contains a project file for Visual C++ newer), named
<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.
It compiles the following libraries from the FreeType 2.5.0 sources:</p>
<ul>
<pre>
freetype250.lib - release build; single threaded
freetype250_D.lib - debug build; single threaded
freetype250MT.lib - release build; multi-threaded
freetype250MT_D.lib - debug build; multi-threaded</pre>
freetype250.lib - release build
freetype250_D.lib - debug build
freetype250ST.lib - release build; single threaded
freetype250ST_D.lib - debug build; single threaded
freetype250MT.lib - release build; multi-threaded
freetype250MT_D.lib - debug build; multi-threaded</pre>
</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

0
builds/win32/visualc/freetype.dsp → builds/windows/visualc/freetype.dsp
View File

0
builds/win32/visualc/freetype.dsw → builds/windows/visualc/freetype.dsw
View File

0
builds/win32/visualc/freetype.sln → builds/windows/visualc/freetype.sln
View File

0
builds/win32/visualc/freetype.vcproj → builds/windows/visualc/freetype.vcproj
View File

0
builds/win32/visualc/index.html → builds/windows/visualc/index.html
View File

0
builds/win32/visualce/freetype.dsp → builds/windows/visualce/freetype.dsp
View File

0
builds/win32/visualce/freetype.dsw → builds/windows/visualce/freetype.dsw
View File

0
builds/win32/visualce/freetype.vcproj → builds/windows/visualce/freetype.vcproj
View File

0
builds/win32/visualce/index.html → builds/windows/visualce/index.html
View File

4
builds/win32/w32-bcc.mk → builds/windows/w32-bcc.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005 by
# Copyright 1996-2000, 2003, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def
EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST)
APINAMES_OPTIONS := -dfreetype.dll -wB
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/bcc.mk
# include linking instructions

4
builds/win32/w32-bccd.mk → builds/windows/w32-bccd.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2006 by
# Copyright 1996-2000, 2003, 2006, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -15,7 +15,7 @@
DEVEL_DIR := $(TOP_DIR)/devel
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/bcc-dev.mk

4
builds/win32/w32-dev.mk → builds/windows/w32-dev.mk
View File

@ -5,7 +5,7 @@
#
# Copyright 1996-2000, 2003, 2006 by
# Copyright 1996-2000, 2003, 2006, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -21,7 +21,7 @@
DEVEL_DIR := $(TOP_DIR)/devel
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/gcc-dev.mk

4
builds/win32/w32-gcc.mk → builds/windows/w32-gcc.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005 by
# Copyright 1996-2000, 2003, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -19,7 +19,7 @@ EXPORTS_OPTIONS = $(EXPORTS_LIST)
APINAMES_OPTIONS := -dfreetype.dll -w
# include Win32-specific definitions
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
# include gcc-specific definitions
include $(TOP_DIR)/builds/compiler/gcc.mk

4
builds/win32/w32-icc.mk → builds/windows/w32-icc.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2005 by
# Copyright 1996-2000, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def
EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST)
APINAMES_OPTIONS := -dfreetype.dll -w
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/visualage.mk
# include linking instructions

4
builds/win32/w32-intl.mk → builds/windows/w32-intl.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005 by
# Copyright 1996-2000, 2003, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def
EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST)
APINAMES_OPTIONS := -dfreetype.dll -w
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/intelc.mk
# include linking instructions

4
builds/win32/w32-lcc.mk → builds/windows/w32-lcc.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000 by
# Copyright 1996-2000, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -14,7 +14,7 @@
SEP := /
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/win-lcc.mk
# include linking instructions

4
builds/win32/w32-mingw32.mk → builds/windows/w32-mingw32.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005 by
# Copyright 1996-2000, 2003, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -19,7 +19,7 @@ EXPORTS_OPTIONS = $(EXPORTS_LIST)
APINAMES_OPTIONS := -dfreetype.dll -w
# include Win32-specific definitions
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
LIBRARY := lib$(PROJECT)

4
builds/win32/w32-vcc.mk → builds/windows/w32-vcc.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005 by
# Copyright 1996-2000, 2003, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/freetype.def
EXPORTS_OPTIONS = /DEF:$(EXPORTS_LIST)
APINAMES_OPTIONS := -dfreetype.dll -w
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/visualc.mk
# include linking instructions

4
builds/win32/w32-wat.mk → builds/windows/w32-wat.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005 by
# Copyright 1996-2000, 2003, 2005, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST = $(OBJ_DIR)/watcom-ftexports.lbc
EXPORTS_OPTIONS = -\"export @$(EXPORTS_LIST)\"-
APINAMES_OPTIONS := -wW
include $(TOP_DIR)/builds/win32/win32-def.mk
include $(TOP_DIR)/builds/windows/win32-def.mk
include $(TOP_DIR)/builds/compiler/watcom.mk
# include linking instructions

4
builds/win32/win32-def.mk → builds/windows/win32-def.mk
View File

@ -3,7 +3,7 @@
#
# Copyright 1996-2000, 2003, 2005, 2006 by
# Copyright 1996-2000, 2003, 2005, 2006, 2013 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -16,7 +16,7 @@
DELETE := del
CAT := type
SEP := $(strip \ )
BUILD_DIR := $(TOP_DIR)/builds/win32
BUILD_DIR := $(TOP_DIR)/builds/windows
PLATFORM := win32
# The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!

6
docs/INSTALL.GNU
View File

@ -54,8 +54,8 @@ instructions in the file `INSTALL.UNIX' instead.
platform win32
compiler gcc
configuration directory .\builds\win32
configuration rules .\builds\win32\w32-gcc.mk
configuration directory .\builds\windows
configuration rules .\builds\windows\w32-gcc.mk
If this does not correspond to your system or settings please
remove the file 'config.mk' from this directory then read the
@ -142,7 +142,7 @@ instructions in the file `INSTALL.UNIX' instead.
font engine in the `objs' directory. On Windows, you can build a
DLL either with MinGW (within an MSYS shell, following the
instructions in `INSTALL.UNIX'), or you use one of the Visual C++
project files; see the subdirectories of `builds/win32'. For
project files; see the subdirectories of `builds/windows'. For
everything else, you are on your own, and you might follow the
instructions in `INSTALL.ANY' to create your own Makefiles.