iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Niels Martin Hansen 2014-05-04 10:35:15 +02:00
parent 5bb4754e40
commit 5a4920c48f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/ffmpeg/ffmpeg.vcxproj
View File

@ -91,7 +91,7 @@
>
<ExecShellScript
Command="make"
Arguments="-j$(NUMBER_OF_PROCESSORS)"
Arguments="$(GmakeParallelBuild)"
WorkingDirectory="$(AegisubObjectDir)"
Configuration="@(ExecShellScript)"
/>

2
build/icu/icu.vcxproj
View File

@ -92,7 +92,7 @@
<ExecShellScript
Command="make"
Arguments="-j$(NUMBER_OF_PROCESSORS)"
Arguments="$(GmakeParallelBuild)"
WorkingDirectory="$(AegisubObjectDir)"
Configuration="@(ExecShellScript)"
/>

4
build/tasks.props
View File

@ -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" />