diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 00:18:12 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:54:30 +0200 |
| commit | ecddbecedccf2bf67e569544854c6fbd1269dd88 (patch) | |
| tree | dec5ee6778bb373f5ea12d1126f9df967e26cc09 /vcl | |
| parent | 4ad9285d302ee820d9ab1ea759497423ae9ec022 (diff) | |
gbuild: clean up Mac OS X framework handling:
There are currently 3 different mechanisms being used for frameworks,
which is of course intolerable so we invent a 4th one and standardize on
it: gb_LinkTarget_use_darwin_frameworks
(This doesn't mean using add_libs or externals was wrong, it was just
inconsistent... and i don't see an obvious benefit of using externals here)
Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ce6d41e4a107..194ef1c4bdd0 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -362,8 +362,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/gdi/coretext/salgdi \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - coretext \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + CoreText \ )) else # ATSUI @@ -443,11 +443,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - $(if $(filter 64,$(BITNESS_OVERRIDE)),,quicktime) \ - cocoa \ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + $(if $(filter 64,$(BITNESS_OVERRIDE)),,QuickTime) \ + Cocoa \ + Carbon \ + CoreFoundation \ )) $(eval $(call gb_Library_use_libraries,vcl,\ @@ -610,9 +610,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/ios/source/window/salmenu \ vcl/ios/source/window/salobj \ )) -$(eval $(call gb_Library_use_externals,vcl,\ - uikit \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + UIKit \ + CoreFoundation \ )) endif |