File tree Expand file tree Collapse file tree 4 files changed +27
-10
lines changed
Expand file tree Collapse file tree 4 files changed +27
-10
lines changed Original file line number Diff line number Diff line change @@ -2,12 +2,12 @@ name: vpn
22channels :
33 - conda-forge
44dependencies :
5- - clang=16.0.6
6- - clang-tools=16.0.6
7- - clangxx=16.0.6
8- - llvm=16.0.6
9- - llvmdev=16.0.6
10- - lld=16.0.6
5+ - clang=19.1.7
6+ - clang-tools=19.1.7
7+ - clangxx=19.1.7
8+ - llvm=19.1.7
9+ - llvmdev=19.1.7
10+ - lld=19.1.7
1111 - python=3.9
1212 - nodejs=18.16.*
1313 - pip=22.3.1
Original file line number Diff line number Diff line change 55if (CMAKE_CXX_COMPILER_ID MATCHES "Clang$" )
66 # We're using clang in msvc mode so we can only use
77 # 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" )
128else ()
139 # /MP -> Compile Files Paraell
1410 # /Zc:preprocessor -> Enable Modern Macros, needed for settingsholder
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 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 >
You can’t perform that action at this time.
0 commit comments