From b599c88582f519a791e995588c949dad351a55c7 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Tue, 9 Sep 2014 12:57:56 +0000
Subject: [PATCH] build: fix an infinite loop in one of our build scripts and
 work around a bug that causes the log files to be saved to an incorrect
 location.

---
 build/visualstudio/Lol.Core.Rules.props |  4 +++-
 build/visualstudio/Lol.Core.Vars.props  | 11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build/visualstudio/Lol.Core.Rules.props b/build/visualstudio/Lol.Core.Rules.props
index 856d6aa2..99bfb949 100644
--- a/build/visualstudio/Lol.Core.Rules.props
+++ b/build/visualstudio/Lol.Core.Rules.props
@@ -96,7 +96,9 @@
         set A=$(SdlLibs)
         :again
         for /f "tokens=1* delims=;" %%I in ("%A%") do (
-          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)" &amp;&amp; set A=%%J
+          if not "%%I" == "" echo xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
+          if not "%%I" == "" xcopy /y /c /d "%%I"\*.dll "$(TargetDir)"
+          if not "%%I" == "" set A=%%J
           if not "%%I" == "" goto again
         )
       </Command>
diff --git a/build/visualstudio/Lol.Core.Vars.props b/build/visualstudio/Lol.Core.Vars.props
index a3fbc639..a1e607a5 100644
--- a/build/visualstudio/Lol.Core.Vars.props
+++ b/build/visualstudio/Lol.Core.Vars.props
@@ -83,9 +83,12 @@
 
     <!-- X360-specific -->
     <XboxDefines>$(XboxDefines)</XboxDefines>
+
   </PropertyGroup>
   <PropertyGroup />
+
   <ItemDefinitionGroup />
+
   <ItemGroup>
     <BuildMacro Include="ExternalDir"><Value>$(ExternalDir)</Value></BuildMacro>
     <BuildMacro Include="FlexDir"><Value>$(FlexDir)</Value></BuildMacro>
@@ -127,8 +130,12 @@
     <BuildMacro Include="OrbisLibs"><Value>$(OrbisLibs)</Value></BuildMacro>
     <BuildMacro Include="OrbisDefines"><Value>$(OrbisDefines)</Value></BuildMacro>
   </ItemGroup>
+
   <PropertyGroup>
-    <OutDir>$(SolutionDir)\..\binaries\$(Platform) $(PlatformToolset) $(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\..\binaries\$(Platform) $(PlatformToolset) $(Configuration)\$(ProjectName)\</IntDir>
+    <!-- Deliberately omit the \ before .. because of an Incredibuild or Visual Studio bug
+         that messes with the log file location. http://stackoverflow.com/q/12101464/111461 -->
+    <OutDir>$(SolutionDir)..\binaries\$(Platform) $(PlatformToolset) $(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\binaries\$(Platform) $(PlatformToolset) $(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
+
 </Project>