From b679c04086b27a18658253ce95dd78305ddeb672 Mon Sep 17 00:00:00 2001
From: kko <pioneer@paahdin.com>
Date: Sat, 7 Jul 2012 14:45:43 -0400
Subject: [PATCH] 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.
---
 .gitignore                    | 1 +
 win32/vc2010/Debug.props      | 3 ++-
 win32/vc2010/PreRelease.props | 3 ++-
 win32/vc2010/Release.props    | 1 +
 win32/vc2010/lua.vcxproj      | 3 +++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8a0de115..cb6ef948c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ stamp-h1
 *.orig
 pioneer-*.tar.*
 Thumbs.db
+*.wwdb
diff --git a/win32/vc2010/Debug.props b/win32/vc2010/Debug.props
index 686b1d175..0554245a4 100755
--- a/win32/vc2010/Debug.props
+++ b/win32/vc2010/Debug.props
@@ -13,7 +13,8 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>
+      </MultiProcessorCompilation>
     </ClCompile>
     <Link />
     <Link>
diff --git a/win32/vc2010/PreRelease.props b/win32/vc2010/PreRelease.props
index 7694f3bab..11681fbc8 100755
--- a/win32/vc2010/PreRelease.props
+++ b/win32/vc2010/PreRelease.props
@@ -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>
diff --git a/win32/vc2010/Release.props b/win32/vc2010/Release.props
index 946a9ab8d..d78e5f181 100755
--- a/win32/vc2010/Release.props
+++ b/win32/vc2010/Release.props
@@ -23,6 +23,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <MinimalRebuild>true</MinimalRebuild>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/win32/vc2010/lua.vcxproj b/win32/vc2010/lua.vcxproj
index cea4cde3a..53d16f590 100644
--- a/win32/vc2010/lua.vcxproj
+++ b/win32/vc2010/lua.vcxproj
@@ -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>