[Git][freetype/freetype][master] 2 commits: [dlg] Lighten up the inclusions.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• c693377e
  by Alexei Podtelezhnikov at 2021-11-07T10:05:05-05:00

  [dlg] Lighten up the inclusions.
  
  The DLG wrapper needs to know if FT_DEBUG_LOGGING is defined in
  `ftoption.h`. It does not need entire FreeType.
  
  * src/dlg/dlgwrap.c: Include FT_CONFIG_OPTIONS_H directly.
  

• 7f4b9bfb
  by Alexei Podtelezhnikov at 2021-11-07T10:20:16-05:00

  [dlg] Define DLG_STATIC explicitly.
  
  DLG_STATIC is intended to disable Windows DLL linking attributes.
  It does not hurt to define it explicitly when we wrap DLG code.
  This fixes tons of LNK4286 and C4273 warnings from MSVC if we
  forget to define DLG_STATIC as a compiler option.
  
  * builds/windows/vc2010/freetype.vcxproj: Remove DLG_STATIC option.
  * src/dlg/dlgwrap.c [FT_DEBUG_LOGGING]: Define DLG_STATIC.
  * include/freetype/internal/ftdebug.h [FT_DEBUG_LOGGING]: Ditto.
  

3 changed files:

• builds/windows/vc2010/freetype.vcxproj
• include/freetype/internal/ftdebug.h
• src/dlg/dlgwrap.c

Changes:

builds/windows/vc2010/freetype.vcxproj

---

...	...	@@ -203,7 +203,7 @@
203	203	<ClCompile>
204	204	<Optimization>Disabled</Optimization>
205	205	<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
206		- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
	206	+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
207	207	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
208	208	<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
209	209	<DisableLanguageExtensions>false</DisableLanguageExtensions>
...	...	@@ -229,7 +229,7 @@
229	229	<ClCompile>
230	230	<Optimization>Disabled</Optimization>
231	231	<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
232		- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
	232	+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
233	233	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
234	234	<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
235	235	<DisableLanguageExtensions>false</DisableLanguageExtensions>
...	...	@@ -255,7 +255,7 @@
255	255	<ClCompile>
256	256	<Optimization>Disabled</Optimization>
257	257	<AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258		- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
	258	+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
259	259	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
260	260	<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
261	261	<DisableLanguageExtensions>false</DisableLanguageExtensions>

include/freetype/internal/ftdebug.h

---

...	...	@@ -32,6 +32,7 @@
32	32	#include "compiler-macros.h"
33	33
34	34	#ifdef FT_DEBUG_LOGGING
	35	+#define DLG_STATIC
35	36	#include <dlg/output.h>
36	37	#include <dlg/dlg.h>
37	38

src/dlg/dlgwrap.c

---

...	...	@@ -16,15 +16,12 @@
16	16	*/
17	17
18	18
19		- /* We have to duplicate these feature test macros from `dlg.c` */
20		- /* since `freetype.h` loads some affected standard headers. */
21		-#define _XOPEN_SOURCE 600
22		-#define _POSIX_C_SOURCE 200809L
23		-
24		-#include <freetype/freetype.h>
	19	+#include <ft2build.h>
	20	+#include FT_CONFIG_OPTIONS_H
25	21
26	22
27	23	#ifdef FT_DEBUG_LOGGING
	24	+#define DLG_STATIC
28	25	#include "dlg.c"
29	26	#else
30	27	/* ANSI C doesn't like empty source files */

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.