Browse Source

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.
undefined
Sam Hocevar 10 years ago
parent
commit
b599c88582
2 changed files with 12 additions and 3 deletions
  1. +3
    -1
      build/visualstudio/Lol.Core.Rules.props
  2. +9
    -2
      build/visualstudio/Lol.Core.Vars.props

+ 3
- 1
build/visualstudio/Lol.Core.Rules.props View File

@@ -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)" && 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>


+ 9
- 2
build/visualstudio/Lol.Core.Vars.props View File

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

Loading…
Cancel
Save