diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-12-26 22:15:06 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-19 15:50:11 -0600 |
| commit | 059e476a8d9af2472503057d7102852e64e9ca0b (patch) | |
| tree | 99a54c3c59e9a0d144828992bd076fc00b5dc8ee | |
| parent | 0bda2285a3523a58675320b0b4ff54bc7afe472b (diff) | |
| download | wix-059e476a8d9af2472503057d7102852e64e9ca0b.tar.gz wix-059e476a8d9af2472503057d7102852e64e9ca0b.tar.bz2 wix-059e476a8d9af2472503057d7102852e64e9ca0b.zip | |
Enable ControlFlowGuard.
| -rw-r--r-- | src/Cpp.Build.props | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 4d2da36f..ef9de6f0 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | 31 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> |
| 32 | <TreatWarningAsError>true</TreatWarningAsError> | 32 | <TreatWarningAsError>true</TreatWarningAsError> |
| 33 | <ExceptionHandling>false</ExceptionHandling> | 33 | <ExceptionHandling>false</ExceptionHandling> |
| 34 | <ControlFlowGuard>Guard</ControlFlowGuard> | ||
| 34 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | 35 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> |
| 35 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | 36 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> |
| 36 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | 37 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> |
| @@ -80,6 +81,7 @@ | |||
| 80 | </ItemDefinitionGroup> | 81 | </ItemDefinitionGroup> |
| 81 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | 82 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> |
| 82 | <ClCompile> | 83 | <ClCompile> |
| 84 | <ControlFlowGuard></ControlFlowGuard> | ||
| 83 | <BasicRuntimeChecks></BasicRuntimeChecks> | 85 | <BasicRuntimeChecks></BasicRuntimeChecks> |
| 84 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | 86 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> |
| 85 | </ClCompile> | 87 | </ClCompile> |
| @@ -99,6 +101,7 @@ | |||
| 99 | </ItemDefinitionGroup> | 101 | </ItemDefinitionGroup> |
| 100 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | 102 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> |
| 101 | <ClCompile> | 103 | <ClCompile> |
| 104 | <ControlFlowGuard></ControlFlowGuard> | ||
| 102 | <BasicRuntimeChecks></BasicRuntimeChecks> | 105 | <BasicRuntimeChecks></BasicRuntimeChecks> |
| 103 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | 106 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> |
| 104 | </ClCompile> | 107 | </ClCompile> |