From 4d87ac8a7fd7d88b46efcf4cda714e2223696021 Mon Sep 17 00:00:00 2001 From: Kenneth Miller Date: Wed, 23 Oct 2013 20:10:56 +0200 Subject: [PATCH] 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. --- ChangeLog | 13 + builds/{win32 => windows}/.gitignore | 0 builds/{win32 => windows}/detect.mk | 0 builds/{win32 => windows}/ftdebug.c | 0 builds/{win32 => windows}/vc2005/freetype.sln | 0 .../{win32 => windows}/vc2005/freetype.vcproj | 0 builds/{win32 => windows}/vc2005/index.html | 0 builds/{win32 => windows}/vc2008/freetype.sln | 0 .../{win32 => windows}/vc2008/freetype.vcproj | 0 builds/{win32 => windows}/vc2008/index.html | 0 builds/{win32 => windows}/vc2010/freetype.sln | 20 +- .../vc2010/freetype.vcxproj | 745 ++++++++++++++++++ .../vc2010/freetype.vcxproj.filters | 0 builds/{win32 => windows}/vc2010/index.html | 22 +- .../{win32 => windows}/visualc/freetype.dsp | 0 .../{win32 => windows}/visualc/freetype.dsw | 0 .../{win32 => windows}/visualc/freetype.sln | 0 .../visualc/freetype.vcproj | 0 builds/{win32 => windows}/visualc/index.html | 0 .../{win32 => windows}/visualce/freetype.dsp | 0 .../{win32 => windows}/visualce/freetype.dsw | 0 .../visualce/freetype.vcproj | 0 builds/{win32 => windows}/visualce/index.html | 0 builds/{win32 => windows}/w32-bcc.mk | 4 +- builds/{win32 => windows}/w32-bccd.mk | 4 +- builds/{win32 => windows}/w32-dev.mk | 4 +- builds/{win32 => windows}/w32-gcc.mk | 4 +- builds/{win32 => windows}/w32-icc.mk | 4 +- builds/{win32 => windows}/w32-intl.mk | 4 +- builds/{win32 => windows}/w32-lcc.mk | 4 +- builds/{win32 => windows}/w32-mingw32.mk | 4 +- builds/{win32 => windows}/w32-vcc.mk | 4 +- builds/{win32 => windows}/w32-wat.mk | 4 +- builds/{win32 => windows}/win32-def.mk | 4 +- docs/INSTALL.GNU | 6 +- 35 files changed, 815 insertions(+), 35 deletions(-) rename builds/{win32 => windows}/.gitignore (100%) rename builds/{win32 => windows}/detect.mk (100%) rename builds/{win32 => windows}/ftdebug.c (100%) rename builds/{win32 => windows}/vc2005/freetype.sln (100%) rename builds/{win32 => windows}/vc2005/freetype.vcproj (100%) rename builds/{win32 => windows}/vc2005/index.html (100%) rename builds/{win32 => windows}/vc2008/freetype.sln (100%) rename builds/{win32 => windows}/vc2008/freetype.vcproj (100%) rename builds/{win32 => windows}/vc2008/index.html (100%) rename builds/{win32 => windows}/vc2010/freetype.sln (56%) rename builds/{win32 => windows}/vc2010/freetype.vcxproj (51%) rename builds/{win32 => windows}/vc2010/freetype.vcxproj.filters (100%) rename builds/{win32 => windows}/vc2010/index.html (56%) rename builds/{win32 => windows}/visualc/freetype.dsp (100%) rename builds/{win32 => windows}/visualc/freetype.dsw (100%) rename builds/{win32 => windows}/visualc/freetype.sln (100%) rename builds/{win32 => windows}/visualc/freetype.vcproj (100%) rename builds/{win32 => windows}/visualc/index.html (100%) rename builds/{win32 => windows}/visualce/freetype.dsp (100%) rename builds/{win32 => windows}/visualce/freetype.dsw (100%) rename builds/{win32 => windows}/visualce/freetype.vcproj (100%) rename builds/{win32 => windows}/visualce/index.html (100%) rename builds/{win32 => windows}/w32-bcc.mk (88%) rename builds/{win32 => windows}/w32-bccd.mk (86%) rename builds/{win32 => windows}/w32-dev.mk (88%) rename builds/{win32 => windows}/w32-gcc.mk (89%) rename builds/{win32 => windows}/w32-icc.mk (89%) rename builds/{win32 => windows}/w32-intl.mk (88%) rename builds/{win32 => windows}/w32-lcc.mk (87%) rename builds/{win32 => windows}/w32-mingw32.mk (89%) rename builds/{win32 => windows}/w32-vcc.mk (88%) rename builds/{win32 => windows}/w32-wat.mk (88%) rename builds/{win32 => windows}/win32-def.mk (91%) diff --git a/ChangeLog b/ChangeLog index cab7158bc..585743bba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2013-10-23 Kenneth Miller + Werner Lemberg + + 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 * src/base/md5.c, src/base/md5.h: Updated to recent version. diff --git a/builds/win32/.gitignore b/builds/windows/.gitignore similarity index 100% rename from builds/win32/.gitignore rename to builds/windows/.gitignore diff --git a/builds/win32/detect.mk b/builds/windows/detect.mk similarity index 100% rename from builds/win32/detect.mk rename to builds/windows/detect.mk diff --git a/builds/win32/ftdebug.c b/builds/windows/ftdebug.c similarity index 100% rename from builds/win32/ftdebug.c rename to builds/windows/ftdebug.c diff --git a/builds/win32/vc2005/freetype.sln b/builds/windows/vc2005/freetype.sln similarity index 100% rename from builds/win32/vc2005/freetype.sln rename to builds/windows/vc2005/freetype.sln diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj similarity index 100% rename from builds/win32/vc2005/freetype.vcproj rename to builds/windows/vc2005/freetype.vcproj diff --git a/builds/win32/vc2005/index.html b/builds/windows/vc2005/index.html similarity index 100% rename from builds/win32/vc2005/index.html rename to builds/windows/vc2005/index.html diff --git a/builds/win32/vc2008/freetype.sln b/builds/windows/vc2008/freetype.sln similarity index 100% rename from builds/win32/vc2008/freetype.sln rename to builds/windows/vc2008/freetype.sln diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj similarity index 100% rename from builds/win32/vc2008/freetype.vcproj rename to builds/windows/vc2008/freetype.vcproj diff --git a/builds/win32/vc2008/index.html b/builds/windows/vc2008/index.html similarity index 100% rename from builds/win32/vc2008/index.html rename to builds/windows/vc2008/index.html diff --git a/builds/win32/vc2010/freetype.sln b/builds/windows/vc2010/freetype.sln similarity index 56% rename from builds/win32/vc2010/freetype.sln rename to builds/windows/vc2010/freetype.sln index 3439f626c..e0f13a290 100644 --- a/builds/win32/vc2010/freetype.sln +++ b/builds/windows/vc2010/freetype.sln @@ -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 diff --git a/builds/win32/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj similarity index 51% rename from builds/win32/vc2010/freetype.vcxproj rename to builds/windows/vc2010/freetype.vcxproj index 5c85da932..3f2772ffc 100644 --- a/builds/win32/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -5,26 +5,50 @@ Debug Multithreaded Win32 + + Debug Multithreaded + x64 + Debug Singlethreaded Win32 + + Debug Singlethreaded + x64 + Debug Win32 + + Debug + x64 + Release Multithreaded Win32 + + Release Multithreaded + x64 + Release Singlethreaded Win32 + + Release Singlethreaded + x64 + Release Win32 + + Release + x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} @@ -34,31 +58,73 @@ StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 @@ -78,29 +144,57 @@ .\..\..\..\objs\win32\vc2010\ .\..\..\..\objs\debug_mt\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + + freetype250_D + freetype250_D freetype250MT_D + freetype250MT_D freetype250ST_D + freetype250ST_D freetype250 + freetype250 freetype250MT + freetype250MT freetype250ST + freetype250ST + + + .\..\..\..\objs\win64\vc2010\ + .\..\..\..\objs\debug\ @@ -127,6 +221,31 @@ true + + + MaxSpeed + OnlyExplicitInline + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + Level4 + + + Default + 4001 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + MaxSpeed @@ -152,6 +271,31 @@ true + + + MaxSpeed + OnlyExplicitInline + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + + + Default + 4001 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + MaxSpeed @@ -175,6 +319,29 @@ + + + MaxSpeed + OnlyExplicitInline + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + + + Default + 4001 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + Disabled @@ -197,6 +364,28 @@ true + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + Level4 + ProgramDatabase + Default + 4001 + true + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + Disabled @@ -219,6 +408,28 @@ true + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + Disabled @@ -243,294 +454,576 @@ true + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + false + false + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks false + false Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks false + false Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks false + false MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) false + false MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) false + false MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) false + false Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -543,279 +1036,531 @@ Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks Disabled + Disabled %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) EnableFastChecks + EnableFastChecks MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/builds/win32/vc2010/freetype.vcxproj.filters b/builds/windows/vc2010/freetype.vcxproj.filters similarity index 100% rename from builds/win32/vc2010/freetype.vcxproj.filters rename to builds/windows/vc2010/freetype.vcxproj.filters diff --git a/builds/win32/vc2010/index.html b/builds/windows/vc2010/index.html similarity index 56% rename from builds/win32/vc2010/index.html rename to builds/windows/vc2010/index.html index caceac116..dbabcebad 100644 --- a/builds/win32/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -1,26 +1,30 @@
- FreeType 2 Project Files for VS.NET 2010 + FreeType 2 Project Files for VS.NET 2010 or newer

- FreeType 2 Project Files for VS.NET 2010 + FreeType 2 Project Files for VS.NET 2010 or newer

-

This directory contains a project file for Visual C++, named -freetype.vcxproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.5.0 sources:

+

This directory contains a project file for Visual C++ newer), named +freetype.vcxproj, and Visual Studio, called freetype.sln. +It compiles the following libraries from the FreeType 2.5.0 sources:

    -    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
    +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
+

Both Win32 and x64 builds are supported.

+

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 .tar.*z archives, be sure to configure your extracting diff --git a/builds/win32/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp similarity index 100% rename from builds/win32/visualc/freetype.dsp rename to builds/windows/visualc/freetype.dsp diff --git a/builds/win32/visualc/freetype.dsw b/builds/windows/visualc/freetype.dsw similarity index 100% rename from builds/win32/visualc/freetype.dsw rename to builds/windows/visualc/freetype.dsw diff --git a/builds/win32/visualc/freetype.sln b/builds/windows/visualc/freetype.sln similarity index 100% rename from builds/win32/visualc/freetype.sln rename to builds/windows/visualc/freetype.sln diff --git a/builds/win32/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj similarity index 100% rename from builds/win32/visualc/freetype.vcproj rename to builds/windows/visualc/freetype.vcproj diff --git a/builds/win32/visualc/index.html b/builds/windows/visualc/index.html similarity index 100% rename from builds/win32/visualc/index.html rename to builds/windows/visualc/index.html diff --git a/builds/win32/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp similarity index 100% rename from builds/win32/visualce/freetype.dsp rename to builds/windows/visualce/freetype.dsp diff --git a/builds/win32/visualce/freetype.dsw b/builds/windows/visualce/freetype.dsw similarity index 100% rename from builds/win32/visualce/freetype.dsw rename to builds/windows/visualce/freetype.dsw diff --git a/builds/win32/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj similarity index 100% rename from builds/win32/visualce/freetype.vcproj rename to builds/windows/visualce/freetype.vcproj diff --git a/builds/win32/visualce/index.html b/builds/windows/visualce/index.html similarity index 100% rename from builds/win32/visualce/index.html rename to builds/windows/visualce/index.html diff --git a/builds/win32/w32-bcc.mk b/builds/windows/w32-bcc.mk similarity index 88% rename from builds/win32/w32-bcc.mk rename to builds/windows/w32-bcc.mk index a9f48fc60..87d8ea3c2 100644 --- a/builds/win32/w32-bcc.mk +++ b/builds/windows/w32-bcc.mk @@ -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 diff --git a/builds/win32/w32-bccd.mk b/builds/windows/w32-bccd.mk similarity index 86% rename from builds/win32/w32-bccd.mk rename to builds/windows/w32-bccd.mk index 51b15d903..dd21eddac 100644 --- a/builds/win32/w32-bccd.mk +++ b/builds/windows/w32-bccd.mk @@ -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 diff --git a/builds/win32/w32-dev.mk b/builds/windows/w32-dev.mk similarity index 88% rename from builds/win32/w32-dev.mk rename to builds/windows/w32-dev.mk index 00cacb0f6..356122947 100644 --- a/builds/win32/w32-dev.mk +++ b/builds/windows/w32-dev.mk @@ -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 diff --git a/builds/win32/w32-gcc.mk b/builds/windows/w32-gcc.mk similarity index 89% rename from builds/win32/w32-gcc.mk rename to builds/windows/w32-gcc.mk index 580afc5c9..3bbdd3cc4 100644 --- a/builds/win32/w32-gcc.mk +++ b/builds/windows/w32-gcc.mk @@ -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 diff --git a/builds/win32/w32-icc.mk b/builds/windows/w32-icc.mk similarity index 89% rename from builds/win32/w32-icc.mk rename to builds/windows/w32-icc.mk index 8819a1f49..44d26bd6c 100644 --- a/builds/win32/w32-icc.mk +++ b/builds/windows/w32-icc.mk @@ -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 diff --git a/builds/win32/w32-intl.mk b/builds/windows/w32-intl.mk similarity index 88% rename from builds/win32/w32-intl.mk rename to builds/windows/w32-intl.mk index ae62e1bcd..0f3e22bc3 100644 --- a/builds/win32/w32-intl.mk +++ b/builds/windows/w32-intl.mk @@ -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 diff --git a/builds/win32/w32-lcc.mk b/builds/windows/w32-lcc.mk similarity index 87% rename from builds/win32/w32-lcc.mk rename to builds/windows/w32-lcc.mk index a147c4cb6..8bd5b5685 100644 --- a/builds/win32/w32-lcc.mk +++ b/builds/windows/w32-lcc.mk @@ -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 diff --git a/builds/win32/w32-mingw32.mk b/builds/windows/w32-mingw32.mk similarity index 89% rename from builds/win32/w32-mingw32.mk rename to builds/windows/w32-mingw32.mk index 04e9e211c..b35dbb0c0 100644 --- a/builds/win32/w32-mingw32.mk +++ b/builds/windows/w32-mingw32.mk @@ -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) diff --git a/builds/win32/w32-vcc.mk b/builds/windows/w32-vcc.mk similarity index 88% rename from builds/win32/w32-vcc.mk rename to builds/windows/w32-vcc.mk index 7fb879486..95f76858f 100644 --- a/builds/win32/w32-vcc.mk +++ b/builds/windows/w32-vcc.mk @@ -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 diff --git a/builds/win32/w32-wat.mk b/builds/windows/w32-wat.mk similarity index 88% rename from builds/win32/w32-wat.mk rename to builds/windows/w32-wat.mk index 820b81735..e1ddf66e3 100644 --- a/builds/win32/w32-wat.mk +++ b/builds/windows/w32-wat.mk @@ -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 diff --git a/builds/win32/win32-def.mk b/builds/windows/win32-def.mk similarity index 91% rename from builds/win32/win32-def.mk rename to builds/windows/win32-def.mk index e6ae31c3b..a65ea4f01 100644 --- a/builds/win32/win32-def.mk +++ b/builds/windows/win32-def.mk @@ -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 !! diff --git a/docs/INSTALL.GNU b/docs/INSTALL.GNU index 0232cb62b..c2ff299a6 100644 --- a/docs/INSTALL.GNU +++ b/docs/INSTALL.GNU @@ -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.