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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/Library_OOoSpotlightImporter.mk | 8 | ||||
| -rw-r--r-- | extensions/Library_pl.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk index 112c7a6bbbed..ef48cb3253fe 100644 --- a/extensions/Library_OOoSpotlightImporter.mk +++ b/extensions/Library_OOoSpotlightImporter.mk @@ -38,10 +38,10 @@ $(eval $(call gb_Library_add_objcobjects,OOoSpotlightImporter,\ extensions/source/macosx/spotlight/main \ )) -$(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\ - -framework CoreFoundation \ - -framework Foundation \ - -framework CoreServices \ +$(eval $(call gb_Library_use_system_darwin_frameworks,OOoSpotlightImporter,\ + CoreFoundation \ + Foundation \ + CoreServices \ )) $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib)) diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 45b1b75d58b7..34b147320771 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -84,10 +84,10 @@ $(eval $(call gb_Library_add_objcxxobjects,pl,\ extensions/source/plugin/aqua/sysplug \ )) -$(eval $(call gb_Library_use_externals,pl,\ - cocoa \ - carbon \ - corefoundation \ +$(eval $(call gb_Library_use_system_darwin_frameworks,pl,\ + Cocoa \ + Carbon \ + CoreFoundation \ )) else # GUIBASE!=aqua |