Changeset 1520 for trunk/build


Ignore:
Timestamp:
Jun 24, 2012, 4:03:14 PM (8 years ago)
Author:
sam
Message:

build: fix the VS2010 build and add build/ and binaries/ to the dist
tarball.

Location:
trunk/build
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.Core.Rules.props

    r1518 r1520  
    1010      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    1111      <FloatingPointModel>Fast</FloatingPointModel>
    12       <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     12      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\src;$(FlexIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1313      <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1414      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1518 r1520  
    33  <ImportGroup Label="PropertySheets" />
    44  <PropertyGroup Label="UserMacros">
    5     <ContribDir>$(SolutionDir)\..\contrib</ContribDir>
     5    <ContribDir>$(SolutionDir)\..\..\contrib</ContribDir>
    66
    77    <!-- Flex & Bison -->
     
    9090  </ItemGroup>
    9191  <PropertyGroup>
    92     <OutDir>$(SolutionDir)\$(Platform) $(Configuration)\</OutDir>
    93     <IntDir>$(SolutionDir)\$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
     92    <OutDir>$(SolutionDir)..\..\binaries\$(Platform) $(Configuration)\</OutDir>
     93    <IntDir>$(SolutionDir)..\..\binaries\$(Platform) $(Configuration)\$(ProjectName)\</IntDir>
    9494  </PropertyGroup>
    9595</Project>
Note: See TracChangeset for help on using the changeset viewer.