Changeset 1384Tweet

Timestamp:

May 14, 2012, 1:48:41 AM (11 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:

• Lol.Fx.props (modified) (1 diff)
• Lol.Fx.targets (modified) (4 diffs)
• Lol.Fx.xml (modified) (2 diffs)

trunk/win32/Lol.Fx.props

@@ -25 +25 @@
 endlocal
 echo ; &gt;&gt; "%D%"</CommandLineTemplate>
-      <ExecutionDescription>Compiling with Lol Fx Build Rule...</ExecutionDescription>
+      <Outputs>$(IntDir)%(FileName)%(Extension).cpp</Outputs>
+      <ExecutionDescription>%(FileName)%(Extension)</ExecutionDescription>
     </LolFxCompile>
   </ItemDefinitionGroup>

trunk/win32/Lol.Fx.targets

@@ -2 +2 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-    <AvailableItemName
-      Include="LolFxCompile">
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
+    <AvailableItemName Include="LolFxCompile">
       <Targets>LolFxCompile</Targets>
     </AvailableItemName>
   </ItemGroup>
+
+  <PropertyGroup>
+    <ComputeCompileInputsTargets>
+      $(ComputeCompileInputsTargets);
+      ComputeLolFxCompileOutput;
+    </ComputeCompileInputsTargets>
+  </PropertyGroup>
+
   <UsingTask
     TaskName="LolFxCompile"
@@ -15 +21 @@
     <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
   </UsingTask>
+
   <Target
     Name="LolFxCompile"
@@ -50 +57 @@
       Condition="'@(LolFxCompile)' != '' and '%(LolFxCompile.ExcludedFromBuild)' != 'true'"
       CommandLineTemplate="%(LolFxCompile.CommandLineTemplate)"
+      Outputs="%(LolFxCompile.Outputs)"
       IntDir="$(IntDir)"
-      Outputs="$(Outputs)"
       FileName="%(FileName)"
       Inputs="@(LolFxCompile)" />
   </Target>
 
-  <PropertyGroup>
-    <ComputeLinkInputsTargets>
-      $(ComputeLinkInputsTargets);
-      ComputeLolFxCompileOutput;
-    </ComputeLinkInputsTargets>
-    <ComputeLibInputsTargets>
-      $(ComputeLibInputsTargets);
-      ComputeLolFxCompileOutput;
-    </ComputeLibInputsTargets>
-  </PropertyGroup>
 
   <Target Name="ComputeLolFxCompileOutput" Condition="'@(LolFxCompile)' != ''">
+    <ItemGroup>
+      <ClCompile Include="@(LolFxCompile->Metadata('CompileOut')->Distinct()->ClearMetadata())" Condition="'%(LolFxCompile.ExcludedFromBuild)' != 'true'">
+        <CompileAs>CompileAsC</CompileAs>
+      </ClCompile>
+      <ClCompile Include="%(LolFxCompile.Outputs)" />
+    </ItemGroup>
     <ItemGroup>
       <LolFxCompile>
@@ -73 +76 @@
       </LolFxCompile>
     </ItemGroup>
-    <ItemGroup>
-      <ClCompile Include="%(LolFxCompile.Outputs)" />
-    </ItemGroup>
   </Target>
 

trunk/win32/Lol.Fx.xml

@@ -51 +51 @@
     </StringListProperty>
     <StringListProperty
-      Name="Outputs"
-      DisplayName="Outputs"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringListProperty
       Name="FileName"
       Category="Command Line"
@@ -61 +56 @@
       Switch=" ">
     </StringListProperty>
+    <StringProperty
+      Name="Outputs"
+      Category="Command Line"
+      IsRequired="true"
+      Switch=" " />
     <StringProperty
       Name="CommandLineTemplate"