diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-07 15:53:35 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-20 11:22:22 +0200 |
| commit | 4967a9d8f96987354b8b55d861e2e3f6fa93e7a4 (patch) | |
| tree | 6166c13ec71ca469883289cc5c080ae16435b33c /Library_merged.mk | |
| parent | 95ebf4e3b3702d5820ba4bbea3ff5eae5e12fe62 (diff) | |
libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 81 |
1 files changed, 70 insertions, 11 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index cc54e95f326c..da48a93df574 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -23,6 +23,11 @@ $(eval $(call gb_Library_Library,merged)) +# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk +$(eval $(call gb_Library_use_library_objects,merged,\ + $(gb_MERGEDLIBS) \ +)) + $(eval $(call gb_Library_use_libraries,merged,\ basegfx \ comphelper \ @@ -34,21 +39,21 @@ $(eval $(call gb_Library_use_libraries,merged,\ sal \ salhelper \ sax \ - sot \ - svl \ tl \ ucbhelper \ utl \ - vcl \ xmlreader \ $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,merged,\ + graphite \ + icule \ icuuc \ jpeg \ + lcms2 \ libxml2 \ - telepathy \ + nss3 \ zlib \ )) @@ -58,21 +63,57 @@ $(eval $(call gb_Library_use_externals,merged,\ )) endif -# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk -$(eval $(call gb_Library_use_library_objects,merged,\ - $(gb_MERGEDLIBS) \ +ifneq ($(OS),IOS) +$(eval $(call gb_Library_use_libraries,merged,\ + jvmaccess \ )) +endif + +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_use_externals,merged,\ + fontconfig \ + freetype \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_use_libraries,merged,\ + dl \ + m \ + pthread \ +)) +endif ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,merged,\ advapi32 \ gdi32 \ + gdiplus \ + imm32 \ + mpr \ + msimg32 \ + $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \ shell32 \ user32 \ uuid \ + version \ winmm \ + winspool \ +)) +endif + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_use_libraries,merged,\ + AppleRemote \ + objc \ +)) +$(eval $(call gb_Library_use_externals,merged,\ + carbon \ + cocoa \ + corefoundation \ + quicktime \ )) endif @@ -80,12 +121,30 @@ ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,merged,\ libotouch \ )) +$(eval $(call gb_Library_add_libs,merged,\ + -llog \ + -landroid \ + -llo-bootstrap \ +)) endif -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_libraries,merged,\ - objc \ - Cocoa \ +ifeq ($(OS),IOS) +$(eval $(call gb_Library_use_externals,merged,\ + corefoundation \ + uikit \ +)) +endif + +ifneq ($(ENABLE_LIBRSVG),NO) +$(eval $(call gb_Library_use_externals,merged,\ + cairo \ +)) +endif + +ifeq ($(ENABLE_TELEPATHY),TRUE) +$(eval $(call gb_Library_use_externals,merged,\ + gtk \ + telepathy \ )) endif |