diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-26 16:33:32 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-26 16:33:32 +0200 |
| commit | c12908c0013a4b486cc74ced3a61ae5b5178be87 (patch) | |
| tree | d708dbb2ae863ac321ec7fecbe4bef0da1895288 | |
| parent | 3297eec4c9c5267bd1450cbfeeca7a63df91e3ef (diff) | |
use uikit, corefoundation, cocoa, carbon, quicktime externals
| -rw-r--r-- | vcl/Library_vcl.mk | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ffa137ca3ef1..b07d5582bd8f 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@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: |