diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-09-07 17:01:04 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:19 +0200 |
| commit | 2db6f67b6e006cfcc6569306eef40f9cafdec798 (patch) | |
| tree | 6f4069c95285be669d02985481109c8239fbbe6f /Library_merged.mk | |
| parent | c140a5fdbba098704ba800c5e4f9b3a2fef2900e (diff) | |
add support for libmerged on Windows
Change-Id: I05d1c557967000be2fb7128b43d6e8c6005a7892
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index f6bf68aaa5c9..6c3b047ac484 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -45,7 +45,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_externals,merged,\ cups \ - icui18n \ icule \ icuuc \ jpeg \ @@ -117,11 +116,19 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\ oleaut32 \ shell32 \ user32 \ + usp10 \ uuid \ version \ winmm \ winspool \ )) +$(eval $(call gb_Library_use_externals,merged,\ + icuin \ +)) +else +$(eval $(call gb_Library_use_externals,merged,\ + icui18n \ +)) endif ifeq ($(OS),MACOSX) |