Skip include\ucrt on VS 2013 packages

win_toolchain/package_from_installed.py

Index: win_toolchain/package_from_installed.py
diff --git a/win_toolchain/package_from_installed.py b/win_toolchain/package_from_installed.py
index a178864a1633a15cb17fad9f9b379f72ca4d73ca..c71de3dab9f78809f6e2f5310397c732415729e7 100644
--- a/win_toolchain/package_from_installed.py
+++ b/win_toolchain/package_from_installed.py
@@ -187,12 +187,14 @@ def GenerateSetEnvCmd(target_dir):
             'set VCINSTALLDIR=%~dp0..\\..\\VC\\\n'
             'set PATH=%~dp0..\\..\\Common7\\IDE;%PATH%\n'
             'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\um;'
-               '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;'
-               '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;'
-               '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;' # VS 2015
-               '%~dp0..\\..\\VC\\include;'
-               '%~dp0..\\..\\VC\\atlmfc\\include\n'
-            'if "%1"=="/x64" goto x64\n'.replace('WINVERSION', WIN_VERSION))

[brucedawson, 2016/02/03 18:56:51]

Ah crap. I accidentally deleted this whole line when I was only supposed to
delete the .replace(). This is causing breakage on the new VS 2015 package, but
I'm not sure why it didn't cause problems before. No packages created since
then?

+            '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;'
+            '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;'.replace(
+                'WINVERSION', WIN_VERSION))
+    if VS_VERSION == '2015':
+      f.write('%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;'.replace(
+                  'WINVERSION', WIN_VERSION))
+    f.write('%~dp0..\\..\\VC\\include;'
+            '%~dp0..\\..\\VC\\atlmfc\\include\n')
 
     # x86. Always use amd64_x86 cross, not x86 on x86.
     f.write('set PATH=%~dp0..\\..\\win_sdk\\bin\\x86;'