[PATCH libreoffice-4-0] fdo#46553 Update embedded manifest on win32 builds to declar...

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3987

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3987/1

fdo#46553 Update embedded manifest on win32 builds to declare dpiAware

Reviewed-on: https://gerrit.libreoffice.org/3981
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Conflicts:

        solenv/gbuild/platform/com_MSC_class.mk

Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
---
M solenv/gbuild/platform/com_MSC_class.mk
A solenv/inc/DeclareDPIAware.manifest
2 files changed, 8 insertions(+), 0 deletions(-)



diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index c965f2b..9adb9ff 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -152,6 +152,7 @@
        $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) \
        $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe 
$(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \
        $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) 
-nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+       $(if $(filter YES,$(TARGETGUI)),; if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest 
-updateresource:$(1)\;1 ; fi) \
        ; exit $$RC)
 endef
 
diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest
new file mode 100644
index 0000000..bb01230
--- /dev/null
+++ b/solenv/inc/DeclareDPIAware.manifest
@@ -0,0 +1,7 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" 
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings";>
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>

-- 
To view, visit https://gerrit.libreoffice.org/3987
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>