Permalink
Browse files

Don't duplicate the task DLL in each folder, but reuse it from the Em…

…scripten folder for each platform.
  • Loading branch information...
1 parent 77ea989 commit 25afdd7e30d44b695ed410fa38a1c68e07f093b8 @juj committed May 15, 2012
Binary file not shown.
@@ -2,9 +2,9 @@
<Import Project="$(VCTargetsPath)\Platforms\Clang\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Clang\ImportBefore')" />
<Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
- <UsingTask TaskName="GCCCompile" AssemblyFile="$(VCTargetsPath)\Platforms\Clang\Clang.Build.CPPTasks.dll" />
- <UsingTask TaskName="GCCLink" AssemblyFile="$(VCTargetsPath)\Platforms\Clang\Clang.Build.CPPTasks.dll" />
- <UsingTask TaskName="GCCLib" AssemblyFile="$(VCTargetsPath)\Platforms\Clang\Clang.Build.CPPTasks.dll" />
+ <UsingTask TaskName="GCCCompile" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
+ <UsingTask TaskName="GCCLink" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
+ <UsingTask TaskName="GCCLib" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
<UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PropertyGroup>
@@ -42,7 +42,7 @@
AcceptableNonZeroExitCodes ="%(ClCompile.AcceptableNonZeroExitCodes)"
GCCToolPath ="$(GccCompiler)"
- GenerateDependencyFiles ="false"
+ GenerateDependencyFile ="false"
EchoCommandLines ="%(ClCompile.EchoCommandLines)"
PropertyXmlFile ="$(VCTargetsPath)\Platforms\Clang\Props\clang_compile.xml"
>
@@ -2,9 +2,9 @@
<Import Project="$(VCTargetsPath)\Platforms\MinGW\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\MinGW\ImportBefore')" />
<Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
- <UsingTask TaskName="GCCCompile" AssemblyFile="$(VCTargetsPath)\Platforms\MinGW\MinGW.Build.CPPTasks.dll" />
- <UsingTask TaskName="GCCLink" AssemblyFile="$(VCTargetsPath)\Platforms\MinGW\MinGW.Build.CPPTasks.dll" />
- <UsingTask TaskName="GCCLib" AssemblyFile="$(VCTargetsPath)\Platforms\MinGW\MinGW.Build.CPPTasks.dll" />
+ <UsingTask TaskName="GCCCompile" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
+ <UsingTask TaskName="GCCLink" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
+ <UsingTask TaskName="GCCLib" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
<UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PropertyGroup>
@@ -82,6 +82,7 @@
AcceptableNonZeroExitCodes ="%(Lib.AcceptableNonZeroExitCodes)"
EchoCommandLines ="%(Lib.EchoCommandLines)"
+ UseClangSyntax ="false"
GCCToolPath ="$(GccLibrarian)"
PropertyXmlFile ="$(VCTargetsPath)\Platforms\MinGW\Props\mingw_lib.xml"
>
Binary file not shown.
@@ -2,9 +2,9 @@
<Import Project="$(VCTargetsPath)\Platforms\NaCl\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\NaCl\ImportBefore')" />
<Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
- <UsingTask TaskName="GCCCompile" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\NaCl.Build.CPPTasks.dll" />
- <UsingTask TaskName="GCCLink" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\NaCl.Build.CPPTasks.dll" />
- <UsingTask TaskName="GCCLib" AssemblyFile="$(VCTargetsPath)\Platforms\NaCl\NaCl.Build.CPPTasks.dll" />
+ <UsingTask TaskName="GCCCompile" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
+ <UsingTask TaskName="GCCLink" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
+ <UsingTask TaskName="GCCLib" AssemblyFile="$(VCTargetsPath)\Platforms\Emscripten\vs-android.Build.CPPTasks.Android.dll" />
<UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<PropertyGroup>
@@ -26,7 +26,7 @@
</ClCompile>
</ItemGroup>
- <GCCCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true' and ('$(PlatformToolset)' == 'mingw' or '$(PlatformToolset)' == 'nacl')"
+ <GCCCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'"
BuildingInIDE ="$(BuildingInsideVisualStudio)"
Sources ="@(ClCompile)"
@@ -82,6 +82,7 @@
EchoCommandLines ="%(Lib.EchoCommandLines)"
GCCToolPath ="$(GccLibrarian)"
+ UseClangSyntax ="false"
PropertyXmlFile ="$(VCTargetsPath)\Platforms\NaCl\Props\mingw_lib.xml"
>
<Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecution" />
Binary file not shown.

0 comments on commit 25afdd7

Please sign in to comment.