From 5a4920c48f74ba0ae7729e78893330edf224820b Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@indvikleren.dk>
Date: Sun, 4 May 2014 10:35:15 +0200
Subject: [PATCH] Option to change parallel make options for gmake based VS
 projects

It seems that gmake can livelock in parallel make mode on Windows
in some cases. This provides an escape hatch for those cases.
---
 build/ffmpeg/ffmpeg.vcxproj | 2 +-
 build/icu/icu.vcxproj       | 2 +-
 build/tasks.props           | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/ffmpeg/ffmpeg.vcxproj b/build/ffmpeg/ffmpeg.vcxproj
index e6c54d187..bf207a0fe 100644
--- a/build/ffmpeg/ffmpeg.vcxproj
+++ b/build/ffmpeg/ffmpeg.vcxproj
@@ -91,7 +91,7 @@
     >
     <ExecShellScript
       Command="make"
-      Arguments="-j$(NUMBER_OF_PROCESSORS)"
+      Arguments="$(GmakeParallelBuild)"
       WorkingDirectory="$(AegisubObjectDir)"
       Configuration="@(ExecShellScript)"
       />
diff --git a/build/icu/icu.vcxproj b/build/icu/icu.vcxproj
index 5ac6755ee..f41c3569a 100644
--- a/build/icu/icu.vcxproj
+++ b/build/icu/icu.vcxproj
@@ -92,7 +92,7 @@
 
     <ExecShellScript
       Command="make"
-      Arguments="-j$(NUMBER_OF_PROCESSORS)"
+      Arguments="$(GmakeParallelBuild)"
       WorkingDirectory="$(AegisubObjectDir)"
       Configuration="@(ExecShellScript)"
       />
diff --git a/build/tasks.props b/build/tasks.props
index 0e4ea0846..06cda1f4b 100644
--- a/build/tasks.props
+++ b/build/tasks.props
@@ -19,6 +19,10 @@
     </ExecShellScript>
   </ItemGroup>
 
+  <PropertyGroup>
+    <GmakeParallelBuild Condition="'$(GmakeParallelBuild)'==''">-j$(NUMBER_OF_PROCESSORS)</GmakeParallelBuild>
+  </PropertyGroup>
+
   <UsingTask TaskName="ExecShellScript" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
   <UsingTask TaskName="MsysPath" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />
   <UsingTask TaskName="UpdateFile" AssemblyFile="$(AegisubBinaryDir)BuildTasks.dll" />