diff --git a/2010 DLL/vs-android.Build.CPPTasks.Android.dll b/2010 DLL/vs-android.Build.CPPTasks.Android.dll
new file mode 100644
index 0000000..28d35b2
Binary files /dev/null and b/2010 DLL/vs-android.Build.CPPTasks.Android.dll differ
diff --git a/2012 DLL/vs-android.Build.CPPTasks.Android.dll b/2012 DLL/vs-android.Build.CPPTasks.Android.dll
new file mode 100644
index 0000000..0d405ee
Binary files /dev/null and b/2012 DLL/vs-android.Build.CPPTasks.Android.dll differ
diff --git a/2013 DLL/vs-android.Build.CPPTasks.Android.dll b/2013 DLL/vs-android.Build.CPPTasks.Android.dll
new file mode 100644
index 0000000..d2525dc
Binary files /dev/null and b/2013 DLL/vs-android.Build.CPPTasks.Android.dll differ
diff --git a/Emscripten/Emscripten.CppBuild.targets b/Emscripten/Emscripten.CppBuild.targets
index b2edc52..602d3bd 100644
--- a/Emscripten/Emscripten.CppBuild.targets
+++ b/Emscripten/Emscripten.CppBuild.targets
@@ -5,6 +5,12 @@
     <UseDefaultGeneralPropertyPageSchema>false</UseDefaultGeneralPropertyPageSchema>
   </PropertyGroup>
 
+  <!-- VS2012 fix - Proper 'general' properties page for vs-android -->
+  <PropertyGroup Condition="$(VisualStudioVersion) != '10.0'">
+    <ToolsetTargetsFound>true</ToolsetTargetsFound>
+  </PropertyGroup>
+
+
   <!-- *******************************************************************************************
         Property pages
        ******************************************************************************************* -->
@@ -37,6 +43,11 @@
       <Context>PropertySheet</Context>
     </PropertyPageSchema>
 
+    <!-- VS2012 fix - Singular C/C++ files can now have their properties edited -->
+    <PropertyPageSchema Condition="$(VisualStudioVersion) != '10.0'" Include="$(VCTargetsPath)$(LangID)\general_file.xml">
+      <Context>File</Context>
+    </PropertyPageSchema>
+
     <!-- Switch view between project property based directories and environment variables -->
     <PropertyPageSchema Include="$(VCTargetsPath)\Platforms\Emscripten\Props\sys_dirs.xml" />
 
diff --git a/Emscripten/Emscripten.EnvVars.props b/Emscripten/Emscripten.EnvVars.props
index 7105d42..68a31fe 100644
--- a/Emscripten/Emscripten.EnvVars.props
+++ b/Emscripten/Emscripten.EnvVars.props
@@ -2,5 +2,9 @@
   <PropertyGroup>
     <SixtyFourBit Condition="'$(ProgramW6432)' != ''">true</SixtyFourBit>
     <SixtyFourBit Condition="'$(ProgramW6432)' == ''">false</SixtyFourBit>
+  
+    <!-- Visual Studio version. A lone install of VS2010 doesn't provide this variable. -->
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+
   </PropertyGroup>
 </Project>
diff --git a/Emscripten/Emscripten.ToolDefaults.props b/Emscripten/Emscripten.ToolDefaults.props
index 688db97..5f5f57d 100644
--- a/Emscripten/Emscripten.ToolDefaults.props
+++ b/Emscripten/Emscripten.ToolDefaults.props
@@ -1,14 +1,14 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemDefinitionGroup>
     <ClCompile>
+      
+      <ObjectFileName>$(IntDir)%(FileName).o</ObjectFileName>
+      
       <PreprocessorDefinitions  Condition="'%(ClCompile.PreprocessorDefinitions)'   == ''"></PreprocessorDefinitions>
       <Warnings                 Condition="'%(ClCompile.Warnings)'                  == ''">NormalWarnings</Warnings>
       <WarningsAsErrors         Condition="'%(ClCompile.WarningsAsErrors)'          == ''">false</WarningsAsErrors>
       <WarnSystemHeaders         Condition="'%(ClCompile.WarnSystemHeaders)'          == ''">false</WarnSystemHeaders>
-      <EchoCommandLines         Condition="'%(ClCompile.EchoCommandLines)'          == ''">false</EchoCommandLines>
-
-      <ObjectFileName Condition="'%(ClCompile.ObjectFileName)'       == ''">$(IntDir)%(Filename).o</ObjectFileName>
-      <ObjectFileName>$(IntDir)%(Filename).o</ObjectFileName>
+      <EchoCommandLines         Condition="'%(ClCompile.EchoCommandLines)'          == ''">true</EchoCommandLines>
 
       <CompileAs                Condition="'%(ClCompile.CompileAs)'                 == ''">Default</CompileAs>
 
@@ -32,17 +32,28 @@
       <SystemIncludeDirectories Condition="'%(ClCompile.SystemIncludeDirectories)'  == ''">$(IncludePath)</SystemIncludeDirectories>
       <SystemPreprocessorDefinitions Condition="'%(ClCompile.SystemPreprocessorDefinitions)' == '' and '$(PlatformToolset)' == 'emcc'">EMSCRIPTEN;__STDC__</SystemPreprocessorDefinitions>
       <SystemPreprocessorUndefinitions Condition="'%(ClCompile.SystemPreprocessorUndefinitions)' == '' and '$(PlatformToolset)' == 'emcc'">_WIN32;WIN32;__i386__;__x86_64__;__i386;__x86_64;__SSE__;__SSE2__;__MMX__;X87_DOUBLE_ROUNDING;HAVE_GCC_ASM_FOR_X87;__STRICT_ANSI__;__CYGWIN__;__APPLE__</SystemPreprocessorUndefinitions>
+      <PrecompiledHeader        Condition="'%(ClCompile.PrecompiledHeader)'         == ''">NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderOutputFile Condition="'%(ClCompile.PrecompiledHeaderOutputFile)' == ''">$(IntDir)$(TargetName).pch.h</PrecompiledHeaderOutputFile>
+
       <GenerateDependencyFile>true</GenerateDependencyFile>
-      <DependencyFileName>"$(IntDir)%(FileName).d"</DependencyFileName>
-      <!--      <EmscriptenCompileFlags Condition="'%(ClCompile.EmscriptenCompileFlags)' == '' and '$(PlatformToolset)' == 'emcc'">-c -m32 -Xclang -triple=i386-pc-linux-gnu -nostdinc -Xclang -nobuiltininc -Xclang -nostdinc++ -Xclang -nostdsysteminc -emit-llvm</EmscriptenCompileFlags> -->
+      <DependencyFileName>$(IntDir)%(FileName).d</DependencyFileName>
+      <EmscriptenCompileFlags Condition="'%(ClCompile.EmscriptenCompileFlags)' == '' and '$(PlatformToolset)' == 'emcc'">-c -m32 -Xclang -triple=i386-pc-linux-gnu -nostdinc -Xclang -nobuiltininc -Xclang -nostdinc++ -Xclang -nostdsysteminc -emit-llvm</EmscriptenCompileFlags>
       <TargetArchitecture        Condition="'%(ClCompile.TargetArchitecture)'         == ''">NotSet</TargetArchitecture>
     </ClCompile>
   </ItemDefinitionGroup>
 
+  <!-- Compiler defaults. Additions for Visual Studio 2012 -->
+  <ItemDefinitionGroup Condition="$(VisualStudioVersion) != '10.0'">
+    <ClCompile>
+      <ProgramDataBaseFileName  Condition="'%(ClCompile.ProgramDataBaseFileName)'   == ''">$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <TrackerLogDirectory      Condition="'%(ClCompile.TrackerLogDirectory)'       == ''">$(TLogLocation)</TrackerLogDirectory>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'emcc'">
     <ClCompile>
-      <GenerateLLVMByteCode        Condition="'%(ClCompile.GenerateLLVMByteCode)'         == ''">true</GenerateLLVMByteCode>
-      <ObjectFileName Condition="'%(ClCompile.ObjectFileName)'       == ''">$(IntDir)%(Filename).o</ObjectFileName>
+      <GenerateLLVMByteCode        Condition="'%(ClCompile.GenerateLLVMByteCode)' == ''">true</GenerateLLVMByteCode>
+      <ObjectFileName Condition="'%(ClCompile.ObjectFileName)' == ''">$(IntDir)%(FileName).o</ObjectFileName>
     </ClCompile>
   </ItemDefinitionGroup>
 
@@ -79,20 +90,31 @@
       <OutputFile                 Condition="'%(Link.OutputFile)'                   == ''">$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories Condition="'%(Link.AdditionalLibraryDirectories)' == ''"></AdditionalLibraryDirectories>
       <EchoCommandLines           Condition="'%(Link.EchoCommandLines)'             == ''">false</EchoCommandLines>
-
       <AdditionalDependencies     Condition="'%(Link.AdditionalDependencies)'       == ''"></AdditionalDependencies>
-
       <TypedArrays  Condition="'%(Link.TypedArrays)'    == ''">NotSet</TypedArrays>
       <IgnoreDynamicLinking  Condition="'%(Link.IgnoreDynamicLinking)'    == ''">false</IgnoreDynamicLinking>
-
       <SystemLibraryDirectories	  Condition="'%(Link.SystemLibraryDirectories)'     == ''">$(LibraryPath)</SystemLibraryDirectories>      
   </Link>
   </ItemDefinitionGroup>
 
+  <!-- Linker defaults. Additions for Visual Studio 2012 -->
+  <ItemDefinitionGroup Condition="$(VisualStudioVersion) != '10.0'">
+    <Link>
+      <TrackerLogDirectory        Condition="'%(Link.TrackerLogDirectory)'          == ''">$(TLogLocation)</TrackerLogDirectory>
+    </Link>
+  </ItemDefinitionGroup>
+
   <ItemDefinitionGroup>
     <Lib>      
       <OutputFile                 Condition="'%(Lib.OutputFile)'                    == ''">$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <EchoCommandLines           Condition="'%(Lib.EchoCommandLines)'              == ''">false</EchoCommandLines>      
+      <EchoCommandLines           Condition="'%(Lib.EchoCommandLines)'              == ''">false</EchoCommandLines>
+    </Lib>
+  </ItemDefinitionGroup>
+
+  <!-- Librarian defaults. Additions for Visual Studio 2012 -->
+  <ItemDefinitionGroup Condition="$(VisualStudioVersion) != '10.0'">
+    <Lib>
+      <TrackerLogDirectory        Condition="'%(Lib.TrackerLogDirectory)'           == ''">$(TLogLocation)</TrackerLogDirectory>
     </Lib>
   </ItemDefinitionGroup>
 </Project>
diff --git a/Emscripten/Emscripten.ToolPaths.props b/Emscripten/Emscripten.ToolPaths.props
index 243475c..49c9186 100644
--- a/Emscripten/Emscripten.ToolPaths.props
+++ b/Emscripten/Emscripten.ToolPaths.props
@@ -1,31 +1,57 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <!-- Present in ALL Emscripten builds, and use the '-Xclang -isystem' prefix. -->
+    <EmscriptenIncludeDir>$(EMSCRIPTEN)\system\local\include;$(EMSCRIPTEN)\system\include\compat;$(EMSCRIPTEN)\system\include\libcxx;$(EMSCRIPTEN)\system\include;$(EMSCRIPTEN)\system\include\emscripten;$(EMSCRIPTEN)\system\include\bsd;$(EMSCRIPTEN)\system\include\libc;$(EMSCRIPTEN)\system\include\gfx;$(EMSCRIPTEN)\system\include\net;$(EMSCRIPTEN)\system\include\SDL</EmscriptenIncludeDir>
+    <ClangPath Condition="'$(ClangPath)' == ''">$(CLANG_BIN)</ClangPath>
+    <MinGWPath Condition="'$(MinGWPath)' == ''">$(MINGW_BIN)</MinGWPath>
+    <EmccPath Condition="'$(EmccPath)' == ''">$(EMSCRIPTEN)</EmccPath>
+    <NaclPath Condition="'$(NaclPath)' == ''">$(NACL_BIN)</NaclPath>
+    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'emcc' ">$(ClangPath);$(EmccPath);$(PATH)</ExecutablePath>
+    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'clang' ">$(ClangPath);$(PATH)</ExecutablePath>
+    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'mingw'">$(MinGWPath);$(PATH)</ExecutablePath>
+    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'nacl'">$(NaclPath);$(PATH)</ExecutablePath>
+    <IncludePath Condition="'$(IncludePath)' == '' and '$(PlatformToolset)' == 'emcc'">$(EmscriptenIncludeDir)</IncludePath>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="$(VisualStudioVersion) == '12.0'">
+    <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VS@ProductDir)</VSInstallDir>
+    <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\Setup\VS@ProductDir)</VSInstallDir>
+    <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\12.0\Setup\VS@ProductDir)</VSInstallDir>
+    <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\12.0\Setup\VS@ProductDir)</VSInstallDir>
+
+    <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC@ProductDir)</VCInstallDir>
+    <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\Setup\VC@ProductDir)</VCInstallDir>
+    <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\12.0\Setup\VC@ProductDir)</VCInstallDir>
+    <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\12.0\Setup\VC@ProductDir)</VCInstallDir>
+
+    <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1A@InstallationFolder)</WindowsSdkDir>
+    <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1A@InstallationFolder)</WindowsSdkDir>
+
+    <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir>
+    <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir>
+
+    <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1A@InstallationFolder)</FrameworkSdkDir>
+    <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1A@InstallationFolder)</FrameworkSdkDir>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(VisualStudioVersion) != '12.0'">
     <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir>
     <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir>
     <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir>
     <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir>
+
     <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir>
     <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir>
     <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir>
     <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir>
+
     <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir>
     <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir>
+
     <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir>
     <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir>
+
     <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir>
     <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir>
-
-    <!-- Present in ALL Emscripten builds, and use the '-Xclang -isystem' prefix. -->
-    <EmscriptenIncludeDir>$(EMSCRIPTEN)\system\local\include;$(EMSCRIPTEN)\system\include\compat;$(EMSCRIPTEN)\system\include\libcxx;$(EMSCRIPTEN)\system\include;$(EMSCRIPTEN)\system\include\emscripten;$(EMSCRIPTEN)\system\include\bsd;$(EMSCRIPTEN)\system\include\libc;$(EMSCRIPTEN)\system\include\gfx;$(EMSCRIPTEN)\system\include\net;$(EMSCRIPTEN)\system\include\SDL</EmscriptenIncludeDir>
-
-    <ClangPath Condition="'$(ClangPath)' == ''">$(CLANG_BIN)</ClangPath>
-    <MinGWPath Condition="'$(MinGWPath)' == ''">$(MINGW_BIN)</MinGWPath>
-    <EmccPath Condition="'$(EmccPath)' == ''">$(EMSCRIPTEN)</EmccPath>
-    <NaclPath Condition="'$(NaclPath)' == ''">$(NACL_BIN)</NaclPath>
-    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'emcc' ">$(ClangPath);$(EmccPath);$(PATH)</ExecutablePath>
-    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'clang' ">$(ClangPath);$(PATH)</ExecutablePath>
-    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'mingw'">$(MinGWPath);$(PATH)</ExecutablePath>
-    <ExecutablePath Condition="'$(ExecutablePath)' == '' and '$(PlatformToolset)' == 'nacl'">$(NaclPath);$(PATH)</ExecutablePath>
-    <IncludePath Condition="'$(IncludePath)' == '' and '$(PlatformToolset)' == 'emcc'">$(EmscriptenIncludeDir)</IncludePath>
   </PropertyGroup>
 </Project>
diff --git a/Emscripten/Microsoft.Cpp.Emscripten.default.props b/Emscripten/Microsoft.Cpp.Emscripten.default.props
index ed64397..57ae34d 100644
--- a/Emscripten/Microsoft.Cpp.Emscripten.default.props
+++ b/Emscripten/Microsoft.Cpp.Emscripten.default.props
@@ -7,6 +7,12 @@
     <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir>
     <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(Configuration)\</IntDir>
     <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>    
-  </PropertyGroup>	
+    <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir>
+  </PropertyGroup>
+
+  <!-- VS2012 additions to the defaults. -->
+  <PropertyGroup Condition="$(VisualStudioVersion) != '10.0'">
+    <TargetName         Condition="'$(TargetName)'      == ''">$(ProjectName)</TargetName>
+    <WindowsAppContainer>false</WindowsAppContainer>
+  </PropertyGroup>
 </Project>
diff --git a/Emscripten/Microsoft.Cpp.Emscripten.targets b/Emscripten/Microsoft.Cpp.Emscripten.targets
index 5eeb58f..9a3c4f6 100644
--- a/Emscripten/Microsoft.Cpp.Emscripten.targets
+++ b/Emscripten/Microsoft.Cpp.Emscripten.targets
@@ -2,9 +2,9 @@
   <Import Project="$(VCTargetsPath)\Platforms\Emscripten\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Emscripten\ImportBefore')" />
   <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
 
-  <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="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" />
 
@@ -24,6 +24,14 @@
         <CompileAs                    Condition="('%(ClCompile.CompileAs)' == 'Default' and '%(ClCompile.Extension)' == '.asm')">CompileAsAsm</CompileAs>
         <CompileAs                    Condition="('%(ClCompile.CompileAs)' == 'Default' and ('%(ClCompile.Extension)' != '.c' and '%(ClCompile.Extension)' != '.s' and '%(ClCompile.Extension)' != '.asm'))">CompileAsCpp</CompileAs>
         <MinimalRebuildFromTracking   Condition="'$(BuildType)' != 'Build' or '$(ForceRebuild)' == 'true'">false</MinimalRebuildFromTracking>
+        <BrowseInformation>false</BrowseInformation>
+      </ClCompile>
+    </ItemGroup>
+
+    <!-- Enable MinimalRebuildFromTracking for VS2012. VS2010 didn't require this for some reason. -->
+    <ItemGroup Condition="$(VisualStudioVersion) != '10.0'">
+      <ClCompile>
+        <MinimalRebuildFromTracking   Condition="'%(ClCompile.MinimalRebuildFromTracking)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</MinimalRebuildFromTracking>
       </ClCompile>
     </ItemGroup>
 
@@ -39,16 +47,15 @@
         ToolPath                           ="$(CLToolPath)"
         TrackFileAccess                    ="$(TrackFileAccess)"
         MinimalRebuildFromTracking         ="%(ClCompile.MinimalRebuildFromTracking)"
-
+        
         AcceptableNonZeroExitCodes         ="%(ClCompile.AcceptableNonZeroExitCodes)"
 
-        GCCToolPath                        ="$(GccCompiler)"
         EchoCommandLines                   ="%(ClCompile.EchoCommandLines)"
-        GenerateDependencyFiles            ="false"
+        GCCToolPath                        ="$(GccCompiler)"
         PropertyXmlFile                    ="$(VCTargetsPath)\Platforms\Emscripten\Props\clang_compile.xml"
     >
     </GCCCompile>
-    <!--GenerateDependencyFiles            ="true" -->
+    <!-- -->
 
   </Target>
 
@@ -59,7 +66,7 @@
        ******************************************************************************************* -->
   <Target Name="Lib"
           Condition="'@(Lib)' != ''">
-    
+
     <ItemGroup>
       <Lib>
         <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking)' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</MinimalRebuildFromTracking>
@@ -92,9 +99,9 @@
     </GCCLib>
 
     <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProjectFile) -&gt; $(TargetPath)" Importance="High" />
-    
+
   </Target>
-  
+
   <!-- *******************************************************************************************
         Link
        ******************************************************************************************* -->
@@ -131,32 +138,36 @@
 
         AcceptableNonZeroExitCodes     ="%(Link.AcceptableNonZeroExitCodes)"
 
-        EchoCommandLines               ="%(Link.EchoCommandLines)"        
-        GCCToolPath                    ="$(GccLinker)"        
+        EchoCommandLines               ="%(Link.EchoCommandLines)"
+        GCCToolPath                    ="$(GccLinker)"
         PropertyXmlFile                ="$(VCTargetsPath)\Platforms\Emscripten\Props\emcc_link.xml"
     >
       <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecution" />
     </GCCLink>
 
     <Message Condition="'$(LinkSkippedExecution)' == 'false'" Text="$(MSBuildProjectFile) -&gt; $(TargetPath)" Importance="High" />
-    
+
   </Target>
 
   <!-- Override the Microsoft.CppBuild.targets stuff -->
   <Import Project="$(VCTargetsPath)\Platforms\Emscripten\Emscripten.CppBuild.targets" />
-  
-	
-	
+
+
+
   <!-- *******************************************************************************************
         PlatformPrepareForBuild target
        ******************************************************************************************* -->
-  
+
   <Target Name="PlatformPrepareForBuild" DependsOnTargets="$(PlatformPrepareForBuildDependsOn)">
+    <!-- For VS2012. $(TargetName) doesn't seem to be defined where TargetPath is setup in the MS scripts. Crude fix for it. -->
+    <PropertyGroup Condition="$(VisualStudioVersion) != '10.0'">
+      <TargetPath>$([System.IO.Path]::Combine($(ProjectDir),$(OutDir)$(TargetName)$(TargetExt)))</TargetPath>
+    </PropertyGroup>
+
+    <Error Condition="$(VisualStudioVersion) != '10.0' and $(VisualStudioVersion) != '11.0' and $(VisualStudioVersion) != '12.0'"
+           Text="Unknown version of Visual Studio: $(VisualStudioVersion)" ></Error>
   </Target>
-	
+
   <Import Project="$(VCTargetsPath)\Platforms\Emscripten\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.Emscripten.$(PlatformToolset).targets" Condition="(exists('$(VCTargetsPath)\Platforms\Emscripten\PlatformToolsets\$(PlatformToolset)\Microsoft.Cpp.Emscripten.$(PlatformToolset).targets'))" />
   <Import Project="$(VCTargetsPath)\Platforms\Emscripten\ImportAfter\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Emscripten\ImportAfter')" />
-</Project>
-
-
-
+</Project>
\ No newline at end of file
diff --git a/Emscripten/Platform.Default.props b/Emscripten/Platform.Default.props
new file mode 100644
index 0000000..857aeb6
--- /dev/null
+++ b/Emscripten/Platform.Default.props
@@ -0,0 +1,5 @@
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(VCTargetsPath)\Platforms\Emscripten\Microsoft.Cpp.Emscripten.default.props" />
+
+</Project>
diff --git a/Emscripten/Platform.props b/Emscripten/Platform.props
new file mode 100644
index 0000000..6341599
--- /dev/null
+++ b/Emscripten/Platform.props
@@ -0,0 +1,5 @@
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(VCTargetsPath)\Platforms\Emscripten\Microsoft.Cpp.Emscripten.props" />
+
+</Project>
diff --git a/Emscripten/Platform.targets b/Emscripten/Platform.targets
new file mode 100644
index 0000000..a74abf3
--- /dev/null
+++ b/Emscripten/Platform.targets
@@ -0,0 +1,5 @@
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(VCTargetsPath)\Platforms\Emscripten\Microsoft.Cpp.Emscripten.targets" />
+
+</Project>
diff --git a/Emscripten/vs_android.Build.CPPTasks.Android.dll b/Emscripten/vs_android.Build.CPPTasks.Android.dll
deleted file mode 100644
index a3e006f..0000000
Binary files a/Emscripten/vs_android.Build.CPPTasks.Android.dll and /dev/null differ
diff --git a/install.cmd b/install.cmd
new file mode 100644
index 0000000..2472e20
--- /dev/null
+++ b/install.cmd
@@ -0,0 +1,82 @@
+@echo off
+Rem This will bail if we don't have admin privs.
+net session >nul 2>&1
+    if errorLevel 1 (
+		Echo.This batch file needs to be run with administrative privileges. Since it copies files to the \Program Files directory.
+		Pause
+		Goto cleanup
+) 
+rem On 64-bit machines, Visual Studio 2013 and MsBuild is in the (x86) directory. So try that last.
+if exist "%ProgramFiles%" set "MsBuildRootDir=%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0"
+if exist "%ProgramFiles(x86)%" set "MsBuildRootDir=%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0"
+
+echo.%MsBuildRootDir%
+set /a n=0
+:loopVisualStudioVersion
+echo.%n%
+if %n%==0 (
+	set VsVersion=2010
+	set "MsBuildCppDir=%MsBuildRootDir%\Platforms"
+)
+if %n%==1 (
+	set VsVersion=2012
+	set "MsBuildCppDir=%MsBuildRootDir%\V110\Platforms"
+)
+if %n%==2 (
+	set VsVersion=2013
+	set "MsBuildCppDir=%MsBuildRootDir%\V120\Platforms"
+)
+if %n%==3 GOTO complete
+
+if not exist "%MsBuildCppDir%" (
+	set /a n=%n%+1
+	goto loopVisualStudioVersion
+)
+
+Echo.Installing into Visual Studio %VsVersion%
+set /a i=0
+:loop
+if %i%==0 set CppVersion=Clang
+if %i%==1 set CppVersion=Emscripten
+if %i%==2 set CppVersion=MinGW
+if %i%==3 set CppVersion=NaCl
+if %i%==4 (
+set /a n=%n%+1
+goto loopVisualStudioVersion
+)
+
+if exist %MsBuildCppDir%\%CppVersion% (	
+	Echo."%CppVersion%" Cpp MsBuild toolset already exists.
+	Echo.Continuing will delete the version already installed to this directory: 
+
+	rd "%MsBuildCppDir%\%CppVersion%" /s		
+	if exist "%MsBuildCppDir%\%CppVersion%" (
+		Echo.Failed to remove directory
+		Pause
+		goto cleanup
+	)
+	echo.
+)
+
+md "%MsBuildCppDir%\%CppVersion%"
+
+echo.Installing %CppVersion% MSBuild files:
+cd /d %~dp0
+xcopy "%CppVersion%\*.*" "%MsBuildCppDir%\%CppVersion%" /E
+if %CppVersion%==Emscripten xcopy "%VsVersion% DLL\*.dll" "%MsBuildCppDir%\%CppVersion%" /E
+
+if errorlevel 1 (	
+	echo.Problem with copying
+	Pause
+	goto cleanup	
+)
+
+SET /a i=%i%+1
+GOTO loop
+
+:complete
+echo.
+echo.Done! You will need to close and re-open existing instances of Visual Studio.
+Pause
+
+:cleanup
\ No newline at end of file