solenv/gbuild/LinkTarget.mk | 1 +
solenv/gbuild/platform/com_MSC_class.mk | 8 ++++----
solenv/gbuild/platform/mingw.mk | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit fa604beee3e8ca26bba7c1d681bf83a44638b835
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Nov 20 15:18:24 2013 +0100
gbuild: TARGETGUI variable must be set on all LinkTargets
... otherwise it will get inherited from Executables to StaticLibraries
and then mt.exe will be unhappy and complain.
Change-Id: Ic9cc32ea3d0fb5d1fe91c1e9efa354fdf30c8264
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 4f71cf1..3d3ac6d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -589,6 +589,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS :=
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX :=
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX :=
$(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
+$(call gb_LinkTarget_get_target,$(1)) : TARGETGUI :=
$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
$(call gb_LinkTarget_get_target,$(1)) : VISIBILITY :=
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 3727103..790ba16 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -376,7 +376,6 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(call gb_LinkTarget_get_target,$(2)) \
$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE := $(call
gb_LinkTarget_get_pdbfile_in,$(2))
-$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
endef
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index fe04223..ac5218c 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -272,7 +272,7 @@ gb_Executable_TARGETTYPEFLAGS :=
gb_Executable_get_rpath :=
define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : TARGETGUI :=
+
endef
# CppunitTest class
commit 397af236af9a2263c042d675efcc041a20c92059
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Nov 20 15:07:37 2013 +0100
gbuild: MSVC 2012 does not like /pdb for static libraries
Complains with warning LNK4044 and ignores it.
Change-Id: Ie91369339d121a652ce51e9229c3ef3b1c39d214
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index b36bed8..3727103 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -190,9 +190,10 @@ $(call gb_Helper_abbreviate_dirs,\
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_ilibfilename,$(lib))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_filename,$(lib))) \
- $(if $(filter-out StaticLibrary,$(TARGETTYPE)),$(T_LIBS)
user32.lib) \
- $(if $(filter-out
StaticLibrary,$(TARGETTYPE)),-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest)
\
- -pdb:$(WORKDIR)/LinkTarget/$(2).pdb \
+ $(if $(filter-out StaticLibrary,$(TARGETTYPE)),\
+ $(T_LIBS) user32.lib \
+ -manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest \
+ -pdb:$(WORKDIR)/LinkTarget/$(2).pdb) \
$(if $(ILIBTARGET),-out:$(1) -implib:$(ILIBTARGET),-out:$(1));
RC=$$?; rm $${RESPONSEFILE} \
$(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then
rm -f $(1); exit 42; fi) \
$(if $(filter Library,$(TARGETTYPE)),&& if [ -f
$(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest
$(WORKDIR)/LinkTarget/$(2).manifest -outputresource:$(1)\;2 && touch -r $(1)
$(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); fi) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
