Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Tools/BuildOurOwnBabylonJS/BabylonJS/BabylonJS.csproj

@@ -42,7 +42,7 @@
     <Resource Include="..\..\..\babylon.*.*.js">
       <Link>%(Filename)%(Extension)</Link>
     </Resource>
-    <Resource Include="..\..\..\Babylon\**\*.*">
+    <Resource Include="..\..\..\Babylon\**\*.js">
       <Link>Babylon\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Resource>
     <Resource Include="..\..\..\Typescript\**\*.*">
@@ -55,8 +55,26 @@
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <TypeScriptSourceMap>true</TypeScriptSourceMap>
   </PropertyGroup>
+  <Choose>
+    <When Condition="Exists('$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets')">
+        <ItemGroup>
+            <TypeScriptCompile Include="..\..\..\Babylon\**\*.ts">
+              <Link>Babylon\%(RecursiveDir)%(Filename)%(Extension)</Link>
+            </TypeScriptCompile>
+        </ItemGroup>
+    </When>
+    <Otherwise>
+        <ItemGroup>
+            <Resource Include="..\..\..\Babylon\**\*.ts">
+                <Link>Babylon\%(RecursiveDir)%(Filename)%(Extension)</Link>
+            </Resource>
+        </ItemGroup>
+    </Otherwise>
+  </Choose>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets')"/>
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <ProjectExtensions>