Only use explicit inlining - otherwise Visual Studio 2010 will inline SDL_zero(info) in SDL_vsnprintf() into a memset() call when compiling the Release x64 configuration.

This commit is contained in:
Sam Lantinga 2015-06-14 18:57:05 -07:00
parent c18e7724eb
commit 564ece516e
2 changed files with 8 additions and 0 deletions

View File

@ -102,6 +102,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat> <DebugInformationFormat>OldStyle</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName> <OmitDefaultLibName>true</OmitDefaultLibName>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -132,6 +133,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>OldStyle</DebugInformationFormat> <DebugInformationFormat>OldStyle</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName> <OmitDefaultLibName>true</OmitDefaultLibName>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -165,6 +167,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName> <OmitDefaultLibName>true</OmitDefaultLibName>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -196,6 +199,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<OmitDefaultLibName>true</OmitDefaultLibName> <OmitDefaultLibName>true</OmitDefaultLibName>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

View File

@ -51,6 +51,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="$(SolutionDir)/../include" AdditionalIncludeDirectories="$(SolutionDir)/../include"
AdditionalUsingDirectories="" AdditionalUsingDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS" PreprocessorDefinitions="_DEBUG;_WINDOWS"
@ -133,6 +134,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="$(SolutionDir)/../include" AdditionalIncludeDirectories="$(SolutionDir)/../include"
AdditionalUsingDirectories="" AdditionalUsingDirectories=""
PreprocessorDefinitions="_DEBUG;_WINDOWS" PreprocessorDefinitions="_DEBUG;_WINDOWS"
@ -214,6 +216,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="$(SolutionDir)/../include" AdditionalIncludeDirectories="$(SolutionDir)/../include"
AdditionalUsingDirectories="" AdditionalUsingDirectories=""
PreprocessorDefinitions="NDEBUG;_WINDOWS" PreprocessorDefinitions="NDEBUG;_WINDOWS"
@ -296,6 +299,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="$(SolutionDir)/../include" AdditionalIncludeDirectories="$(SolutionDir)/../include"
AdditionalUsingDirectories="" AdditionalUsingDirectories=""
PreprocessorDefinitions="NDEBUG;_WINDOWS" PreprocessorDefinitions="NDEBUG;_WINDOWS"