Author: hdu
Date: Thu Jan 9 09:51:25 2014
New Revision: 1556769
URL: http://svn.apache.org/r1556769
Log:
#i114728# fix linking of quicktime framework on SDK!=10.7
Modified:
openoffice/trunk/main/vcl/Library_vcl.mk
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1556769&r1=1556768&r2=1556769&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Thu Jan 9 09:51:25 2014
@@ -510,13 +510,14 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_linked_libs,vcl,\
AppleRemote \
))
-$(eval $(call gb_Library_add_ldflags,vcl,\
+$(eval $(call gb_Library_set_ldflags,vcl,\
+ $$(LDFLAGS) \
-framework Cocoa \
-framework Carbon \
-framework CoreFoundation \
))
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
-$(eval $(call gb_Library_add_ldflags,vcl, -framework QuickTime ))
+$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
endif
endif
