From daefd6e6cfb10f524a8840401af49cf46661569a Mon Sep 17 00:00:00 2001 From: Priyesh Kumar Date: Thu, 30 Jul 2020 15:21:49 +0530 Subject: [PATCH] [builds/windows] Skip dlg build for Release builds of FreeType on Windows --- [priyesh]ChangeLog | 10 +++++++++- builds/windows/vc2010/freetype.sln | 4 ---- include/freetype/config/ftoption.h | 6 +----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[priyesh]ChangeLog b/[priyesh]ChangeLog index 2b3b21269..b2e194f7e 100644 --- a/[priyesh]ChangeLog +++ b/[priyesh]ChangeLog @@ -1,5 +1,13 @@ 2020-07-30 Priyesh Kumar + * builds/windows/vc2010/freetype.sln: Skip building dlg for `Release' and + `Release Static' Configurations on both platforms. + + * include/freetype/config/ftoption.h (DLG_STATIC): Removed Macro. + Removed comments related to `DLG_STATIC' macro. + + * [priyesh]ChangeLog: Fix typo. + Added a Visual Studios project to build dlg along with FreeType on Windows. * builds/windows/dlg/dlg.{vcxproj, vcxproj.filters}: New files. @@ -17,7 +25,7 @@ (AdditionalDependencies): Added `dlg.lib' as a dependency for `Debug` configuration of FreeType on both platforms. (PreprocessorDefinitions): Added `DLG_STATIC' for `Debug Static' - configuration on bot platforms. + configuration on both platforms. * [priyesh]ChangeLog: Fix date. diff --git a/builds/windows/vc2010/freetype.sln b/builds/windows/vc2010/freetype.sln index b82230581..37cd941b7 100644 --- a/builds/windows/vc2010/freetype.sln +++ b/builds/windows/vc2010/freetype.sln @@ -43,13 +43,9 @@ Global {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug|x64.ActiveCfg = Debug|x64 {F15A5E7B-F721-4D61-9573-19AEE9177027}.Debug|x64.Build.0 = Debug|x64 {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|Win32.ActiveCfg = Debug Static|Win32 - {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|Win32.Build.0 = Debug Static|Win32 {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|x64.ActiveCfg = Debug Static|x64 - {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release Static|x64.Build.0 = Debug Static|x64 {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|Win32.ActiveCfg = Debug Static|Win32 - {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|Win32.Build.0 = Debug Static|Win32 {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|x64.ActiveCfg = Debug Static|x64 - {F15A5E7B-F721-4D61-9573-19AEE9177027}.Release|x64.Build.0 = Debug Static|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 51dde31c3..f4b7a083c 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -442,13 +442,9 @@ FT_BEGIN_HEADER * error and trace log messages to a file instead of `stderr` * For writing logs to file FreeType uses an external library `dlg` * Source Code - `src/dlg` - * - * When on Windows platform, and using a static build of dlg to link - * it with FreeType, Define the macro `DLG_STATIC` so that it gets - * linked properly(see src/dlg/include/dlg.h:76) + * */ /* #define FT_LOGGING */ -/* #define DLG_STATIC */ /************************************************************************** *