Skip to content

Commit 6f625e6

Browse files
authored
Merge pull request input-leap#1669 from lreeves/dpi-aware-manifests
Re-add manifests for Windows with DPI-aware flag
2 parents ad3c0e3 + 5976805 commit 6f625e6

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

src/client/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ set(sources
2121
if (BUILD_MSWINDOWS)
2222
file(GLOB mswin_headers "MSWindows*.h")
2323
file(GLOB mswin_sources "MSWindows*.cpp")
24-
list(APPEND sources input-leapc.rc)
24+
list(APPEND sources
25+
input-leapc.exe.manifest
26+
input-leapc.rc
27+
)
2528
set_property(SOURCE input-leapc.rc PROPERTY COMPILE_FLAGS /nologo)
2629
endif()
2730
if (BUILD_CARBON)

src/client/input-leapc.exe.manifest

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>

src/server/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ set(sources
2121
if (BUILD_MSWINDOWS)
2222
file(GLOB mswin_headers "MSWindows*.h")
2323
file(GLOB mswin_sources "MSWindows*.cpp")
24-
list(APPEND sources input-leaps.rc)
24+
list(APPEND sources
25+
input-leaps.exe.manifest
26+
input-leaps.rc
27+
)
2528
set_property(SOURCE input-leaps.rc PROPERTY COMPILE_FLAGS /nologo)
2629
endif()
2730
if (BUILD_CARBON)

src/server/input-leaps.exe.manifest

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application></assembly>

0 commit comments

Comments
 (0)