diff options
author | Andras Timar <atimar@suse.com> | 2013-05-20 20:30:04 +0200 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-05-20 18:48:38 +0000 |
commit | d044918751da4bbdf87f7fb12382abf6c4068c07 (patch) | |
tree | dd86bebbc1d092ebd8485c7a3c00e858995417e8 /solenv | |
parent | e673655ba784bd2993fb4e364c042fbc0e938d2d (diff) |
fdo#46553 Update embedded manifest on win32 builds to declare dpiAware
Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd
Reviewed-on: https://gerrit.libreoffice.org/3981
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 | ||||
-rw-r--r-- | solenv/inc/DeclareDPIAware.manifest | 7 |
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 1ea04664696b..bd033d577051 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -219,6 +219,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(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 && touch -r $(1) $(DLLTARGET).manifest $(DLLTARGET); fi) \ $(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1 && touch -r $(1) $(1).manifest; 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) \ $(if $(filter Library,$(TARGETTYPE)),&& \ echo $(notdir $(DLLTARGET)) > $(1).exports.tmp && \ $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest new file mode 100644 index 000000000000..bb0123062766 --- /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> |