Disable multi-process compilation since it clashes with incremental linking. Disable a warning for a file we can do nothing about.

Update .gitignore with a VS file type.
master
kko 2012-07-07 14:45:43 -04:00
parent 6deae07a92
commit b679c04086
5 changed files with 9 additions and 2 deletions

1
.gitignore vendored
View File

@ -48,3 +48,4 @@ stamp-h1
*.orig
pioneer-*.tar.*
Thumbs.db
*.wwdb

View File

@ -13,7 +13,8 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MultiProcessorCompilation>
</MultiProcessorCompilation>
</ClCompile>
<Link />
<Link>

View File

@ -14,7 +14,8 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MultiProcessorCompilation>
</MultiProcessorCompilation>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointModel>Fast</FloatingPointModel>

View File

@ -23,6 +23,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<MinimalRebuild>true</MinimalRebuild>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />

View File

@ -133,6 +133,7 @@
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4146</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -146,6 +147,7 @@
<AdditionalIncludeDirectories>../../src;../../win32/src;../../win32/include;../../contrib</AdditionalIncludeDirectories>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<DisableSpecificWarnings>4146</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -160,6 +162,7 @@
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
<DisableSpecificWarnings>4146</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>