summaryrefslogtreecommitdiffhomepage
path: root/zlib
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 /zlib
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 'zlib')
-rw-r--r--zlib/Zlib.vcxproj12
1 files changed, 7 insertions, 5 deletions
diff --git a/zlib/Zlib.vcxproj b/zlib/Zlib.vcxproj
index f70dcb2..9cad8a6 100644
--- a/zlib/Zlib.vcxproj
+++ b/zlib/Zlib.vcxproj
@@ -237,8 +237,8 @@
<Optimization>Disabled</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<PrecompiledHeaderOutputFile>.\Debug\Zlib.pch</PrecompiledHeaderOutputFile>
@@ -269,7 +269,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<PrecompiledHeaderOutputFile>.\Debug\Zlib.pch</PrecompiledHeaderOutputFile>
@@ -354,7 +354,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -383,7 +383,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -412,7 +412,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<StringPooling>true</StringPooling>
- <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
@@ -523,11 +523,13 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug x64|Win32'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>