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 /sfx2 | |
| parent | vcl: clean up that Xinerama linkage... (diff) | |
| download | core-ecddbecedccf2bf67e569544854c6fbd1269dd88.tar.gz core-ecddbecedccf2bf67e569544854c6fbd1269dd88.zip | |
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 'sfx2')
| -rw-r--r-- | sfx2/Library_sfx.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 23badc19286e..c384a1b98046 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -280,8 +280,10 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - objc \ +$(eval $(call gb_Library_add_libs,sfx,\ + -lobjc \ +)) +$(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\ Cocoa \ )) endif |