summaryrefslogtreecommitdiffhomepage
path: root/Magic2
diff options
context:
space:
mode:
authorYasha Jannoo <alledodo@gmail.com>2019-09-10 01:33:35 +0100
committerYasha Jannoo <alledodo@gmail.com>2019-09-10 01:33:35 +0100
commit5d694ca25f75a8809290f6fbd865ef9fd1eec12c (patch)
treee28aa00b2187bab482b5bc16f41c30b19e61fea1 /Magic2
parentecb247e559e1e06cb261edbd43d97ae10fddb302 (diff)
downloadstarshatter-5d694ca25f75a8809290f6fbd865ef9fd1eec12c.zip
starshatter-5d694ca25f75a8809290f6fbd865ef9fd1eec12c.tar.gz
starshatter-5d694ca25f75a8809290f6fbd865ef9fd1eec12c.tar.bz2
Turn off edit and continue.
Fixes incompatibility between /ZI and /Gy- by not allowing ZI at all for the time-being. We can turn it on again later.
Diffstat (limited to 'Magic2')
-rw-r--r--Magic2/Magic.vcxproj11
1 files changed, 6 insertions, 5 deletions
diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj
index 2b23bf0..d1cac69 100644
--- a/Magic2/Magic.vcxproj
+++ b/Magic2/Magic.vcxproj
@@ -236,8 +236,8 @@
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../oggvorbis/include;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
@@ -295,7 +295,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../oggvorbis/include;../Opcode/OpcodeLib;../libpng;../Magic2;../FoundationEx;../nGenEx;../zlib;../parser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;FOUNDATION_USE_MFC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
@@ -431,7 +431,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -485,7 +485,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -539,7 +539,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -695,6 +695,7 @@
</Link>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>