solenv/gbuild/platform/com_MSC_class.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7263d223ddf42cc39d10a501159c7b04ef48df96
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Dec 11 07:08:20 2018 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Dec 11 08:17:34 2018 +0100
tdf#121685: also apply DeclareDPIAware manifest to console applications
There's no reason not to; and now soffice.bin itself is built as a console
application.
Change-Id: Iba080498b02af04780fdfe1053fb00f584eaae81
Reviewed-on: https://gerrit.libreoffice.org/64915
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 327d2ae54542..18db567bfc50 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -190,7 +190,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(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
$(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest
-outputresource:$(1)\;2 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest
$(ILIBTARGET); fi) \
$(if $(filter Executable,$(TARGETTYPE)),&& if [ -f
$(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest
$(WORKDIR)/LinkTarget/$(2).manifest
$(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest
-outputresource:$(1)\;1 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest;
fi) \
- $(if $(filter YES,$(TARGETGUI)),&& mt.exe $(MTFLAGS) -nologo -manifest
$(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest
-updateresource:$(1)\;1 ) \
+ $(if $(filter Executable,$(TARGETTYPE)),&& mt.exe $(MTFLAGS) -nologo
-manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest
-updateresource:$(1)\;1 ) \
$(if $(filter Library,$(TARGETTYPE)),&& \
echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp &&
\
$(if $(filter
YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
