From 1dfa85e7e41464b2cadaa3957b01cb464c0ffe1c Mon Sep 17 00:00:00 2001
From: Rob <rob@synchro.net>
Date: Sun, 11 Oct 2020 16:28:07 -0700
Subject: [PATCH] Resolve Error: '/ZI' and '/Gy-' command-line options are
 incompatible

MSVC Error D8016. Just disable "edit and continue" support.
---
 src/doors/clans-src/clans.vcxproj    | 4 +++-
 src/doors/clans-src/langcomp.vcxproj | 2 +-
 src/doors/clans-src/mcomp.vcxproj    | 2 +-
 src/doors/clans-src/pcedit.vcxproj   | 2 +-
 src/doors/clans-src/reset.vcxproj    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/doors/clans-src/clans.vcxproj b/src/doors/clans-src/clans.vcxproj
index 851d099e2b..984a02bc8d 100644
--- a/src/doors/clans-src/clans.vcxproj
+++ b/src/doors/clans-src/clans.vcxproj
@@ -32,10 +32,12 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+    <Import Project="..\..\odoors\odoors.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+    <Import Project="..\..\odoors\odoors.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -57,7 +59,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\Win32_Debug\</AssemblerListingLocation>
       <PrecompiledHeaderOutputFile>.\Win32_Debug\clans.pch</PrecompiledHeaderOutputFile>
diff --git a/src/doors/clans-src/langcomp.vcxproj b/src/doors/clans-src/langcomp.vcxproj
index 56d9a382d2..abb3e6bafd 100644
--- a/src/doors/clans-src/langcomp.vcxproj
+++ b/src/doors/clans-src/langcomp.vcxproj
@@ -102,7 +102,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\win32_debug\</AssemblerListingLocation>
       <PrecompiledHeaderOutputFile>.\win32_debug\langcomp.pch</PrecompiledHeaderOutputFile>
diff --git a/src/doors/clans-src/mcomp.vcxproj b/src/doors/clans-src/mcomp.vcxproj
index dc3dcaef0f..c23da77515 100644
--- a/src/doors/clans-src/mcomp.vcxproj
+++ b/src/doors/clans-src/mcomp.vcxproj
@@ -102,7 +102,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\Win32_Debug\</AssemblerListingLocation>
       <PrecompiledHeaderOutputFile>.\Win32_Debug\mcomp.pch</PrecompiledHeaderOutputFile>
diff --git a/src/doors/clans-src/pcedit.vcxproj b/src/doors/clans-src/pcedit.vcxproj
index 7ce72e6a30..53e477096f 100644
--- a/src/doors/clans-src/pcedit.vcxproj
+++ b/src/doors/clans-src/pcedit.vcxproj
@@ -68,7 +68,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\Win32_Debug\</AssemblerListingLocation>
       <PrecompiledHeaderOutputFile>.\Win32_Debug\pcedit.pch</PrecompiledHeaderOutputFile>
diff --git a/src/doors/clans-src/reset.vcxproj b/src/doors/clans-src/reset.vcxproj
index 88f8ca1148..683f6ef579 100644
--- a/src/doors/clans-src/reset.vcxproj
+++ b/src/doors/clans-src/reset.vcxproj
@@ -102,7 +102,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <MinimalRebuild>true</MinimalRebuild>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\Win32_Debug\</AssemblerListingLocation>
       <PrecompiledHeaderOutputFile>.\Win32_Debug\reset.pch</PrecompiledHeaderOutputFile>
-- 
GitLab