diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-19 14:22:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-19 15:49:50 +0200 |
| commit | bae655a7c2c5bb7e612b068eea34ec5780c58513 (patch) | |
| tree | 5bacb417176829a2665007c4f86d485e9e75c42d /vcl/Library_vcl.mk | |
| parent | c34cad49fadd376a61904e2201d85fbe908c348b (diff) | |
De-duplication of CoreText code and headers for OS X and iOS
Nominally renamed the AquaSalGraphics class to QuartzSalGraphics, as
it isn't now then "Aqua" (Mac OS X) specific any more.
Actually, for Mac OS X, because lots of code in vcl/aqua expects it to
be called AquaSalGraphics (just like the alternative class used when
using the obsolete ATSUI API on Mac OS X), use a #define to make it
still be called AquaSalGraphics to the compiler's eyes. For iOS it can
be called QuartzSalGraphics.
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ed843bf10971..29f764fddba9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -361,10 +361,10 @@ $(eval $(call gb_Library_add_defs,vcl,\ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/aqua/source/gdi/coretext/salcoretextfontutils \ - vcl/aqua/source/gdi/coretext/salcoretextlayout \ - vcl/aqua/source/gdi/coretext/salcoretextstyle \ - vcl/aqua/source/gdi/coretext/salgdi \ + vcl/coretext/salcoretextfontutils \ + vcl/coretext/salcoretextlayout \ + vcl/coretext/salcoretextstyle \ + vcl/coretext/salgdi \ )) ifeq ($(MACOSX_SDK_VERSION),1070) @@ -602,11 +602,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/ios/source/dtrans/iOSTransferable \ vcl/ios/source/dtrans/ios_clipboard \ vcl/ios/source/dtrans/service_entry \ - vcl/ios/source/gdi/salcoretextfontutils \ - vcl/ios/source/gdi/salcoretextlayout \ - vcl/ios/source/gdi/salcoretextstyle \ + vcl/coretext/salcoretextfontutils \ + vcl/coretext//salcoretextlayout \ + vcl/coretext//salcoretextstyle \ vcl/ios/source/gdi/salbmp \ - vcl/ios/source/gdi/salgdi \ + vcl/coretext/salgdi \ vcl/ios/source/gdi/salgdicommon \ vcl/ios/source/gdi/salnativewidgets \ vcl/ios/source/gdi/salgdiutils \ |