Updated generate_winrt_projects to produce Windows 10 projects

build/common.gypi

@@ -9,6 +9,7 @@
         'angle_path%': '<(DEPTH)',
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
+        'angle_build_winrt_app_type_revision%': '8.1',
         # angle_code is set to 1 for the core ANGLE targets defined in src/build_angle.gyp.
         # angle_code is set to 0 for test code, sample code, and third party code.
         # When angle_code is 1, we build with additional warning flags on Mac and Linux.

build/common_defines.gypi

@@ -9,6 +9,7 @@
         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
         'angle_build_winrt%': '0',
         'angle_build_winphone%': '0',
+        'angle_build_winrt_app_type_revision%': '8.1',
     },
     'msvs_disabled_warnings':
     [

generate_winrt_projects.py

@@ -12,9 +12,8 @@ angle_dir = os.path.normpath(os.path.join(script_dir, os.pardir))
 gyp_dir = os.path.join(angle_dir, 'third_party', 'gyp')
 
 gyp_generators = "msvs"
-msvs_version = "2013e"
 
-def generateProjects(generation_dir, build_winphone):
+def generateProjects(generation_dir, build_winphone, msvs_version, app_type_rev):
     gyp_cmd = os.path.join(gyp_dir, 'gyp')
     gyp_cmd += ' --ignore-environment'
     gyp_cmd += ' --depth=.'
@@ -22,8 +21,9 @@ def generateProjects(generation_dir, build_winphone):
     gyp_cmd += ' --generator-output=' + generation_dir
     gyp_cmd += ' --format=' + gyp_generators
     gyp_cmd += ' -G msvs_version=' + msvs_version
-    gyp_cmd += ' -D angle_use_commit_id=0'
+    gyp_cmd += ' -D angle_use_commit_id=1'
     gyp_cmd += ' -D angle_build_winrt=1'
+    gyp_cmd += ' -D angle_build_winrt_app_type_revision=' + app_type_rev
     gyp_cmd += ' -D angle_build_winphone=' + ('1' if build_winphone else '0')
     gyp_cmd += ' -D angle_enable_d3d9=0'
     gyp_cmd += ' -D angle_enable_gl=0'
@@ -37,5 +37,8 @@ def generateProjects(generation_dir, build_winphone):
 
 if __name__ == '__main__':
     # Generate Windows 8.1 projects
-    generateProjects("winrt/8.1/windows", False);
-    generateProjects("winrt/8.1/windowsphone", True);
+    generateProjects("winrt/8.1/windows", False, "2013e", "8.1");
+    generateProjects("winrt/8.1/windowsphone", True, "2013e", "8.1");
\ No newline at end of file
+
+    # Generate Windows 10 projects
+    generateProjects("winrt/10", False, "2015", "8.2");
\ No newline at end of file

src/angle.gyp

@@ -67,6 +67,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                 }],
                 ['angle_build_winphone==1',
                 {
@@ -92,6 +93,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                     'type' : 'shared_library',
                 }],
                 ['angle_build_winphone==1',
@@ -140,6 +142,7 @@
                         ['angle_build_winrt==1',
                         {
                             'msvs_enable_winrt' : '1',
+                            'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                             'type' : 'shared_library',
                         }],
                         ['angle_build_winphone==1',
@@ -177,6 +180,7 @@
                         ['angle_build_winrt==1',
                         {
                             'msvs_enable_winrt' : '1',
+                            'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                             'type' : 'shared_library',
                         }],
                         ['angle_build_winphone==1',
@@ -221,6 +225,7 @@
                         ['angle_build_winrt==1',
                         {
                             'msvs_enable_winrt' : '1',
+                            'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                             'type' : 'shared_library',
                         }],
                         ['angle_build_winphone==1',

src/compiler.gypi

@@ -219,6 +219,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                 }],
                 ['angle_build_winphone==1',
                 {
@@ -258,6 +259,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                 }],
                 ['angle_build_winphone==1',
                 {
@@ -308,6 +310,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                 }],
                 ['angle_build_winphone==1',
                 {
@@ -347,6 +350,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                 }],
                 ['angle_build_winphone==1',
                 {

src/libGLESv2.gypi

@@ -679,6 +679,7 @@
                         'NTDDI_VERSION=NTDDI_WINBLUE',
                     ],
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                     'msvs_requires_importlibrary' : 'true',
                     'msvs_settings':
                     {
@@ -730,6 +731,7 @@
                 ['angle_build_winrt==1',
                 {
                     'msvs_enable_winrt' : '1',
+                    'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
                     'msvs_requires_importlibrary' : 'true',
                     'msvs_settings':
                     {