diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-05-28 18:04:20 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-05-28 18:04:20 +0200 |
| commit | cba7ba90d28654d06df05157af550063070d24cd (patch) | |
| tree | 9c1929eeff9a2ad70b55ce6723604162373d4334 /windows/nsis-plugins/src | |
| parent | 788f1d81688bba6db9c370c0eb2640f97bf3b9a1 (diff) | |
| parent | 886727539da572ba9ca0a81b969fc5d509f384a7 (diff) | |
| download | mullvadvpn-cba7ba90d28654d06df05157af550063070d24cd.tar.xz mullvadvpn-cba7ba90d28654d06df05157af550063070d24cd.zip | |
Merge branch 'win-enable-cfg'
Diffstat (limited to 'windows/nsis-plugins/src')
| -rw-r--r-- | windows/nsis-plugins/src/cleanup/cleanup.vcxproj | 1 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/log/log.vcxproj | 3 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/pathedit/pathedit.vcxproj | 1 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/registry/registry.vcxproj | 1 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/string/string.vcxproj | 1 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/tray/tray.vcxproj | 1 |
6 files changed, 7 insertions, 1 deletions
diff --git a/windows/nsis-plugins/src/cleanup/cleanup.vcxproj b/windows/nsis-plugins/src/cleanup/cleanup.vcxproj index 3dbb32ca65..6c1d4edb72 100644 --- a/windows/nsis-plugins/src/cleanup/cleanup.vcxproj +++ b/windows/nsis-plugins/src/cleanup/cleanup.vcxproj @@ -93,6 +93,7 @@ <AdditionalIncludeDirectories>$(ProjectDir)../../../../mullvad-nsis/include;$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpp20</LanguageStandard> + <ControlFlowGuard>Guard</ControlFlowGuard> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/windows/nsis-plugins/src/log/log.vcxproj b/windows/nsis-plugins/src/log/log.vcxproj index b194f4684a..8c9be11880 100644 --- a/windows/nsis-plugins/src/log/log.vcxproj +++ b/windows/nsis-plugins/src/log/log.vcxproj @@ -93,6 +93,7 @@ <AdditionalIncludeDirectories>$(ProjectDir)../../../../mullvad-nsis/include;$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpp20</LanguageStandard> + <ControlFlowGuard>Guard</ControlFlowGuard> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -132,4 +133,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/windows/nsis-plugins/src/pathedit/pathedit.vcxproj b/windows/nsis-plugins/src/pathedit/pathedit.vcxproj index 7822e704c8..31302c2f87 100644 --- a/windows/nsis-plugins/src/pathedit/pathedit.vcxproj +++ b/windows/nsis-plugins/src/pathedit/pathedit.vcxproj @@ -88,6 +88,7 @@ <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpp20</LanguageStandard> + <ControlFlowGuard>Guard</ControlFlowGuard> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/windows/nsis-plugins/src/registry/registry.vcxproj b/windows/nsis-plugins/src/registry/registry.vcxproj index 80ea2c4d79..844a552347 100644 --- a/windows/nsis-plugins/src/registry/registry.vcxproj +++ b/windows/nsis-plugins/src/registry/registry.vcxproj @@ -88,6 +88,7 @@ <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpp20</LanguageStandard> + <ControlFlowGuard>Guard</ControlFlowGuard> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/windows/nsis-plugins/src/string/string.vcxproj b/windows/nsis-plugins/src/string/string.vcxproj index 1626019ab7..6e1ad62a15 100644 --- a/windows/nsis-plugins/src/string/string.vcxproj +++ b/windows/nsis-plugins/src/string/string.vcxproj @@ -88,6 +88,7 @@ <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpp20</LanguageStandard> + <ControlFlowGuard>Guard</ControlFlowGuard> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/windows/nsis-plugins/src/tray/tray.vcxproj b/windows/nsis-plugins/src/tray/tray.vcxproj index 15561ff6bf..5c289e560f 100644 --- a/windows/nsis-plugins/src/tray/tray.vcxproj +++ b/windows/nsis-plugins/src/tray/tray.vcxproj @@ -88,6 +88,7 @@ <AdditionalIncludeDirectories>$(ProjectDir)../../../../dist-assets/binaries/x86_64-pc-windows-msvc/;$(ProjectDir)../../../windows-libraries/src/;$(ProjectDir)../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <LanguageStandard>stdcpp20</LanguageStandard> + <ControlFlowGuard>Guard</ControlFlowGuard> </ClCompile> <Link> <SubSystem>Windows</SubSystem> |