Changeset 1384


Ignore:
Timestamp:
May 14, 2012, 1:48:41 AM (8 years ago)
Author:
sam
Message:

build: lolfx files are now properly linked into the static library
when building with Visual Studio.

Location:
trunk/win32
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/win32/Lol.Fx.props

    r1380 r1384  
    2525endlocal
    2626echo ; &gt;&gt; "%D%"</CommandLineTemplate>
    27       <ExecutionDescription>Compiling with Lol Fx Build Rule...</ExecutionDescription>
     27      <Outputs>$(IntDir)%(FileName)%(Extension).cpp</Outputs>
     28      <ExecutionDescription>%(FileName)%(Extension)</ExecutionDescription>
    2829    </LolFxCompile>
    2930  </ItemDefinitionGroup>
  • trunk/win32/Lol.Fx.targets

    r1380 r1384  
    22<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup>
    4     <PropertyPageSchema
    5       Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
    6     <AvailableItemName
    7       Include="LolFxCompile">
     4    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
     5    <AvailableItemName Include="LolFxCompile">
    86      <Targets>LolFxCompile</Targets>
    97    </AvailableItemName>
    108  </ItemGroup>
     9
     10  <PropertyGroup>
     11    <ComputeCompileInputsTargets>
     12      $(ComputeCompileInputsTargets);
     13      ComputeLolFxCompileOutput;
     14    </ComputeCompileInputsTargets>
     15  </PropertyGroup>
     16
    1117  <UsingTask
    1218    TaskName="LolFxCompile"
     
    1521    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
    1622  </UsingTask>
     23
    1724  <Target
    1825    Name="LolFxCompile"
     
    5057      Condition="'@(LolFxCompile)' != '' and '%(LolFxCompile.ExcludedFromBuild)' != 'true'"
    5158      CommandLineTemplate="%(LolFxCompile.CommandLineTemplate)"
     59      Outputs="%(LolFxCompile.Outputs)"
    5260      IntDir="$(IntDir)"
    53       Outputs="$(Outputs)"
    5461      FileName="%(FileName)"
    5562      Inputs="@(LolFxCompile)" />
    5663  </Target>
    5764
    58   <PropertyGroup>
    59     <ComputeLinkInputsTargets>
    60       $(ComputeLinkInputsTargets);
    61       ComputeLolFxCompileOutput;
    62     </ComputeLinkInputsTargets>
    63     <ComputeLibInputsTargets>
    64       $(ComputeLibInputsTargets);
    65       ComputeLolFxCompileOutput;
    66     </ComputeLibInputsTargets>
    67   </PropertyGroup>
    6865
    6966  <Target Name="ComputeLolFxCompileOutput" Condition="'@(LolFxCompile)' != ''">
     67    <ItemGroup>
     68      <ClCompile Include="@(LolFxCompile->Metadata('CompileOut')->Distinct()->ClearMetadata())" Condition="'%(LolFxCompile.ExcludedFromBuild)' != 'true'">
     69        <CompileAs>CompileAsC</CompileAs>
     70      </ClCompile>
     71      <ClCompile Include="%(LolFxCompile.Outputs)" />
     72    </ItemGroup>
    7073    <ItemGroup>
    7174      <LolFxCompile>
     
    7376      </LolFxCompile>
    7477    </ItemGroup>
    75     <ItemGroup>
    76       <ClCompile Include="%(LolFxCompile.Outputs)" />
    77     </ItemGroup>
    7878  </Target>
    7979
  • trunk/win32/Lol.Fx.xml

    r1380 r1384  
    5151    </StringListProperty>
    5252    <StringListProperty
    53       Name="Outputs"
    54       DisplayName="Outputs"
    55       Visible="False"
    56       IncludeInCommandLine="False" />
    57     <StringListProperty
    5853      Name="FileName"
    5954      Category="Command Line"
     
    6156      Switch=" ">
    6257    </StringListProperty>
     58    <StringProperty
     59      Name="Outputs"
     60      Category="Command Line"
     61      IsRequired="true"
     62      Switch=" " />
    6363    <StringProperty
    6464      Name="CommandLineTemplate"
Note: See TracChangeset for help on using the changeset viewer.