[Libreoffice-commits] .: vcl/Library_vcl.mk

[Bjoern Michaelsen]

 vcl/Library_vcl.mk |   28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 7b30b8bfc99db1e9737ff6c6cea937af8f5bb749
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jul 26 16:33:32 2011 +0200

    use uikit, corefoundation, cocoa, carbon, quicktime externals

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ffa137c..b07d558 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -245,6 +245,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/ios/source/gdi/salgdi \
     vcl/ios/source/gdi/salvd \
 ))
+$(eval $(call gb_Library_use_externals,vcl,\
+	uikit \
+	corefoundation \
+))
+
 endif
 
 $(eval $(call gb_Library_add_cobjects,vcl,\
@@ -504,11 +509,11 @@ ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     AppleRemote \
 ))
-$(eval $(call gb_Library_add_libs,vcl,\
-    -framework QuickTime \
-    -framework Cocoa \
-    -framework Carbon \
-    -framework CoreFoundation \
+$(eval $(call gb_Library_use_externals,vcl,\
+    quicktime \
+    cocoa \
+    carbon \
+    corefoundation \
 ))
 endif
 
@@ -518,11 +523,6 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
     /ENTRY:LibMain at 12 \
 ))
 endif
-ifeq ($(COM),GCC)
-$(eval $(call gb_Library_add_ldflags,vcl,\
-    $$(LDFLAGS) \
-))
-endif
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     advapi32 \
     gdi32 \
@@ -542,12 +542,4 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 ))
 endif
 
-ifeq ($(GUIBASE),cocoatouch)
-$(eval $(call gb_Library_add_ldflags,vcl,\
-    -framework UIKit \
-    -framework CoreFoundation \
-))
-endif
-
-
 # vim: set noet sw=4 ts=4: