add wpftdraw to Library_merged

Change-Id: I40471e76a338430e010ad53f64aa6328f3c81b44

add wpftdraw to Library_merged
Change-Id: I40471e76a338430e010ad53f64aa6328f3c81b44
26d08e75 · Peter Foley · 36e3331b · 26d08e75 · 26d08e75
Kaydet (Commit) 26d08e75 authored Mar 21, 2013 tarafından Peter Foley
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Library_merged.mk Library_merged.mk +3 -1

pre_MergedLibsList.mk solenv/gbuild/extensions/pre_MergedLibsList.mk +3 -1

No files found.
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -60,11 +60,13 @@ $(eval $(call gb_Library_use_externals,merged,\
 	nss3 \
 	openssl \
 	$(if $(filter-out IOS,$(OS)),\
+	cdr \
 	wpd \
 	wpg \
 	wps \
 	mwaw \
-	) \
+	mspub \
+	visio) \
 	zlib \
 ))


--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -73,7 +73,9 @@ gb_MERGEDLIBS := \
 	uui \
 	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	vcl \
-	$(if $(filter-out IOS,$(OS)),wpftwriter) \
+	$(if $(filter-out IOS,$(OS)), \
+	wpftdraw \
+	wpftwriter) \
 	xmlscript \
 	xmlsecurity \
 	xo \