diff options
| author | Slawomir Cygan <slawomir.cygan@intel.com> | 2017-06-14 19:15:31 +0200 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2017-06-27 11:03:12 -0600 |
| commit | 1ef324febd501175476be53851fa462ef8d540f2 (patch) | |
| tree | 1f868475941eabfe18051e62e7fc880e93b9eb46 /windowsRuntimeInstaller/ConfigureRT.vcxproj | |
| parent | 21baabc6f066b9470b7c7a6c49576c4e33c7ad22 (diff) | |
| download | usermoji-1ef324febd501175476be53851fa462ef8d540f2.tar.xz | |
build: Enable control flow guard on Windows
This enables the 'Control Flow Guard' security feature, which
prevents memory corruption vulnerabilites by placing a restriction
on where application can execute from.
The change is applied to both VulkanRT and it's NSIS installer.
WARN: This change requires re-patching and rebuillding NSIS with
attached patch.
WARN#2: This change requires Visual Studion 2015 or vs140 toolset to
take effect.
Control Flow Guard documentation:
https://msdn.microsoft.com/en-us/library/windows/desktop/mt637065(v=vs.85).aspx
Change-Id: I7683c0570087d994961c79fb64419509f83536a8
Diffstat (limited to 'windowsRuntimeInstaller/ConfigureRT.vcxproj')
| -rw-r--r-- | windowsRuntimeInstaller/ConfigureRT.vcxproj | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/windowsRuntimeInstaller/ConfigureRT.vcxproj b/windowsRuntimeInstaller/ConfigureRT.vcxproj index 2627b179..a7181a0c 100644 --- a/windowsRuntimeInstaller/ConfigureRT.vcxproj +++ b/windowsRuntimeInstaller/ConfigureRT.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -45,6 +45,7 @@ <Optimization>Disabled</Optimization>
<SDLCheck>false</SDLCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <ControlFlowGuard>Guard</ControlFlowGuard>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -60,6 +61,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <ControlFlowGuard>Guard</ControlFlowGuard>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
|