diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 20:42:09 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:04 -0400 |
| commit | 3c8f17930eeacb7250ecfc01cbf557e50234e307 (patch) | |
| tree | e6bd259cd970c787023ec98fbbc69e972dea43f2 /Library_merged.mk | |
| parent | 49d8bc1dcce4c662d85d894567501205f94f678d (diff) | |
add desktop_detector, subsequenttest, test, and vclplug_svp to Library_merged
Change-Id: Ic2201436d1e4fe01670e2086e7dd1c6c525c9e91
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 2a078945d3bc..c4b14a044729 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_library_objects,merged,\ )) $(eval $(call gb_Library_use_libraries,merged,\ + $(if $(filter unx,$(GUIBASE)),basebmp) \ basegfx \ comphelper \ cppu \ @@ -39,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ salhelper \ tl \ ucbhelper \ + unotest \ xmlreader \ $(gb_UWINAPI) \ )) @@ -50,6 +52,7 @@ $(eval $(call gb_Library_use_static_libraries,merged,\ endif $(eval $(call gb_Library_use_externals,merged,\ + cppunit \ cups \ icui18n \ icule \ @@ -112,6 +115,18 @@ $(eval $(call gb_Library_add_libs,merged,\ )) endif +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_add_libs,merged,\ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ +)) +$(eval $(call gb_Library_use_static_libraries,merged,\ + headless \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ |