From 143de0713b1d74a1c48edc88ef82d0f173fd24f7 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@indvikleren.dk>
Date: Sat, 3 May 2014 01:08:56 +0200
Subject: [PATCH] Remove whitespace in MSYS shell environment vars

It seems that whitespace around the paths in the PATH, LIB, INCLUDE env
vars can break in some situations, making the build fail entirely.
Unfortunately this also makes the file harder to read and diff.
---
 build/tasks.props | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/build/tasks.props b/build/tasks.props
index 1e0f35a3f..0e4ea0846 100644
--- a/build/tasks.props
+++ b/build/tasks.props
@@ -11,28 +11,11 @@
       <Configuration>$(Configuration)</Configuration>
       <Platform>$(Platform)</Platform>
       <Sh>$(MsysBasePath)\bin\sh.exe</Sh>
-      <INCLUDE>
-        $(MSBuildProjectDirectory);
-        $(AegisubSourceBase)\include;
-        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include;
-        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\include;
-        C:\Program Files (x86)\Windows Kits\8.1\Include\um;
-        C:\Program Files (x86)\Windows Kits\8.1\Include\shared;
-      </INCLUDE>
+      <INCLUDE>$(MSBuildProjectDirectory);$(AegisubSourceBase)\include;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\include;C:\Program Files (x86)\Windows Kits\8.1\Include\um;C:\Program Files (x86)\Windows Kits\8.1\Include\shared;</INCLUDE>
       <PATH Condition="'$(Platform)'=='Win32'">$(MsysBasePath)\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin;</PATH>
       <PATH Condition="'$(Platform)'=='x64'">$(MsysBasePath)\bin;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\amd64;</PATH>
-      <LIB Condition="'$(Platform)'=='Win32'">
-        $(AegisubLibraryDir);
-        C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x86;
-        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib;
-        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\lib;
-      </LIB>
-      <LIB Condition="'$(Platform)'=='x64'">
-        $(AegisubLibraryDir);
-        C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x64;
-        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\amd64;
-        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\lib\amd64;
-      </LIB>
+      <LIB Condition="'$(Platform)'=='Win32'">$(AegisubLibraryDir);C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x86;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\lib;</LIB>
+      <LIB Condition="'$(Platform)'=='x64'">$(AegisubLibraryDir);C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x64;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc\lib\amd64;</LIB>
     </ExecShellScript>
   </ItemGroup>