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 | |
| parent | c140a5fdbba098704ba800c5e4f9b3a2fef2900e (diff) | |
add support for libmerged on Windows
Change-Id: I05d1c557967000be2fb7128b43d6e8c6005a7892
| -rw-r--r-- | Library_merged.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 8 |
2 files changed, 16 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) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 6483d4741508..151327eb0d5b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -341,6 +341,13 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb +# avoid fatal error LNK1170 for Library_merged +define gb_LinkTarget_MergedResponseFile +cut -f -1000 -d ' ' $${RESPONSEFILE} > $${RESPONSEFILE}.1 && \ +cut -f 1001- -d ' ' $${RESPONSEFILE} >> $${RESPONSEFILE}.1 && \ +mv $${RESPONSEFILE}.1 $${RESPONSEFILE} && +endef + define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_Helper_abbreviate_dirs,\ @@ -354,6 +361,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ $(NATIVERES)) && \ + $(if $(filter $(call gb_Library_get_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \ unset INCLUDE && \ $(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ |