From 99d76565ae01420f64cef3972d2c114d6cb95e03 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 13 May 2012 23:48:41 +0000
Subject: [PATCH] build: lolfx files are now properly linked into the static
 library when building with Visual Studio.

---
 win32/Lol.Fx.props   |  3 ++-
 win32/Lol.Fx.targets | 36 ++++++++++++++++++------------------
 win32/Lol.Fx.xml     | 10 +++++-----
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/win32/Lol.Fx.props b/win32/Lol.Fx.props
index 7e94e845..07ecad40 100644
--- a/win32/Lol.Fx.props
+++ b/win32/Lol.Fx.props
@@ -24,7 +24,8 @@ for /F "tokens=1,* delims=`" %%L in ('type "%(Fullpath)"') do (
 )
 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>
 </Project>
diff --git a/win32/Lol.Fx.targets b/win32/Lol.Fx.targets
index 2fdf1641..92e3a63a 100644
--- a/win32/Lol.Fx.targets
+++ b/win32/Lol.Fx.targets
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     TaskFactory="XamlTaskFactory"
     AssemblyName="Microsoft.Build.Tasks.v4.0">
     <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
   </UsingTask>
+
   <Target
     Name="LolFxCompile"
     BeforeTargets="$(LolFxCompileBeforeTargets)"
@@ -49,32 +56,25 @@
     <LolFxCompile
       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>
         <CompileOut>$(IntDir)\%(FileName).lolfx.cpp</CompileOut>
       </LolFxCompile>
     </ItemGroup>
-    <ItemGroup>
-      <ClCompile Include="%(LolFxCompile.Outputs)" />
-    </ItemGroup>
   </Target>
 
 </Project>
diff --git a/win32/Lol.Fx.xml b/win32/Lol.Fx.xml
index 597fe27c..04d034a1 100644
--- a/win32/Lol.Fx.xml
+++ b/win32/Lol.Fx.xml
@@ -49,17 +49,17 @@
           SourceType="Item" />
       </StringListProperty.DataSource>
     </StringListProperty>
-    <StringListProperty
-      Name="Outputs"
-      DisplayName="Outputs"
-      Visible="False"
-      IncludeInCommandLine="False" />
     <StringListProperty
       Name="FileName"
       Category="Command Line"
       IsRequired="true"
       Switch=" ">
     </StringListProperty>
+    <StringProperty
+      Name="Outputs"
+      Category="Command Line"
+      IsRequired="true"
+      Switch=" " />
     <StringProperty
       Name="CommandLineTemplate"
       DisplayName="Command Line"