diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 00:18:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:07 +0200 |
| commit | cee32aae398283c38b42c73add694e9d074a5d62 (patch) | |
| tree | 6b24d1825a8ecab75c160db1734f7660c8759621 /Library_merged.mk | |
| parent | b05430409b3eb3a4b8649895788e025fc9a0d9a0 (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 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 8914e598e5fc..847e5474e576 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -131,12 +131,12 @@ $(eval $(call gb_Library_use_libraries,merged,\ AppleRemote \ objc \ )) -$(eval $(call gb_Library_use_externals,merged,\ - carbon \ - cocoa \ - corefoundation \ - coreservices \ - quicktime \ +$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ + Carbon \ + Cocoa \ + CoreFoundation \ + CoreServices \ + QuickTime \ )) endif @@ -162,9 +162,9 @@ $(eval $(call gb_Library_use_externals,merged,\ endif ifeq ($(OS),IOS) -$(eval $(call gb_Library_use_externals,merged,\ - corefoundation \ - uikit \ +$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ + CoreFoundation \ + UIKit \ )) endif |