diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-11-19 11:46:03 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:05:31 +0200 |
commit | a12454b390a718e982461255491c0f26a5a3bbca (patch) | |
tree | 16a99b5a6f4d795d89a53329fa8444b5eed91a49 /vcl/Library_vcl.mk | |
parent | 2afd347f508a3e30dd7065061c48f4f738e17934 (diff) |
Use GLyphy for text on Windows (broken)
Work in progress. Produces visible text in some cases, but not nearly
all. The text that is visible is roughly in the right place and of the
right size, but horribly ugly. Compare to glyphy-demo, which does
produce beautiful text, so the problem is not in the GLyphy code but
in the way we use it.
Include sources from GLyphy's "demo" directory (with only slight
modifications to avoid unconditional debug output) and use that "demo"
API from vcl.
The changes to existing vcl code are all in one place, in the
winlayout.cxx file.
Change-Id: I69cce5d66db534c6f4c1ab85d520b6090baf8fe0
Diffstat (limited to 'vcl/Library_vcl.mk')
-rw-r--r-- | vcl/Library_vcl.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 983e10fd228a..f3981dd774e1 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ $(if $(filter WNTGCC,$(OS)$(COM)),-I$(MINGW_SYSROOT)/include/gdiplus) \ + $(if $(filter WNT,$(OS)),-I$(SRCDIR)/vcl/inc/glyphy/demo) \ )) ifeq ($(ENABLE_DBUS),TRUE) @@ -690,6 +691,7 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/glyphy/demo \ vcl/opengl/win/gdiimpl \ vcl/opengl/win/WinDeviceInfo \ vcl/opengl/win/blocklist_parser \ |