diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-03-12 01:11:20 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-23 23:23:20 -0500 |
| commit | 55fd57ecfe1ce17779b744355b4e9c64dba0712d (patch) | |
| tree | 5822be3caa19daaea30a9ca195655a9114ab190a /vcl/Library_vcl.mk | |
| parent | e45bb323eea8edacfe40a4b5dec991ddf36f303b (diff) | |
move ATSUI entangled-code into its specific sub-directory
This is prep work to make room for a CoreText-based implementation
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index cf09be5a7c7e..f98ca9835c51 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -324,9 +324,26 @@ $(eval $(call gb_Library_use_packages,vcl,\ # GUIBASE specific stuff ifeq ($(GUIBASE),aqua) + $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ )) + +ifeq ($(ENABLE_CORETEXT),YES) + +$(eval $(call gb_Library_add_defs,vcl,\ + -DENABLE_CORETEXT \ +)) + +else # ATSUI + +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/aqua/source/gdi/atsui/salatslayout \ + vcl/aqua/source/gdi/atsui/salatsuifontutils \ + vcl/aqua/source/gdi/atsui/salgdi \ +)) +endif + $(eval $(call gb_Library_add_objcxxobjects,vcl,\ vcl/aqua/source/a11y/aqua11yactionwrapper \ vcl/aqua/source/a11y/aqua11ycomponentwrapper \ @@ -380,11 +397,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/dtrans/PictToBmpFlt \ vcl/aqua/source/dtrans/aqua_clipboard \ vcl/aqua/source/dtrans/service_entry \ - vcl/aqua/source/gdi/salatslayout \ - vcl/aqua/source/gdi/salatsuifontutils \ vcl/aqua/source/gdi/salbmp \ vcl/aqua/source/gdi/salcolorutils \ - vcl/aqua/source/gdi/salgdi \ vcl/aqua/source/gdi/salgdiutils \ vcl/aqua/source/gdi/salmathutils \ vcl/aqua/source/gdi/salnativewidgets \ @@ -403,6 +417,10 @@ $(eval $(call gb_Library_use_externals,vcl,\ carbon \ corefoundation \ )) + +$(eval $(call gb_Library_use_libraries,vcl,\ + AppleRemote \ +)) endif vcl_generic_code=\ |