Skip to content

Commit f69d72f

Browse files
committed
Add a Manifest adding Supportinfo to .exe
Huuuh why does that build locally not that it seems revert that toooo enable manifest tool
1 parent 39e8fc8 commit f69d72f

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

src/cmake/msvc.cmake

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
44

55
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
6-
# We're using clang in msvc mode so we can only use
7-
# msvc style compile flags
8-
# We need to disable /Manifest tool as clang's implementation
9-
# of mt.exe (llvm-mt) is not a complete drop in soloution.
10-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
11-
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
6+
127
else()
138
# /MP -> Compile Files Paraell
149
# /Zc:preprocessor -> Enable Modern Macros, needed for settingsholder

src/cmake/windows.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set_target_properties(mozillavpn PROPERTIES
1515
VERSION ${CMAKE_PROJECT_VERSION}
1616
WIN32_EXECUTABLE ON
1717
)
18+
target_sources(mozillavpn PRIVATE ${CMAKE_SOURCE_DIR}/windows/vpn.manifest)
1819

1920
# When used with MSVC, we find that RelWithDebInfo produces rather suboptimal
2021
# compiler flags. If we want to generate debugging symbols, then we should

windows/vpn.manifest

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
3+
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
4+
5+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
6+
<application>
7+
<!-- Max Tested: Windows 11 -->
8+
<maxversiontested Id="10.0.22000.1"/>
9+
<!-- Supports Windows 10 and Windows 11 -->
10+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
11+
</application>
12+
</compatibility>
13+
14+
<asmv3:application>
15+
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
16+
<dpiAwareness>PerMonitorV2</dpiAwareness>
17+
</asmv3:windowsSettings>
18+
</asmv3:application>
19+
20+
</assembly>

0 commit comments

Comments
 (0)