Skip to content

A
angle
Commit 66d6313e by Cooper Partin Committed by Geoff Lang
Options

Add target platform version for generating Windows 10 WinRT projects

BUG=angleproject:1122 Change-Id: Ia6a79ef1b4e94e15830981f0cee6269c9f0c71ca Reviewed-on: https://chromium-review.googlesource.com/293401Tested-by: 's avatarCooper Partin <coopp@microsoft.com> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent f4e794ec
Showing with 20 additions and 101 deletions
build/common.gypi
......@@ -10,6 +10,7 @@
'angle_build_winrt%': '0',
'angle_build_winphone%': '0',
'angle_build_winrt_app_type_revision%': '8.1',
'angle_build_winrt_target_platform_ver%' : '',
# 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.
......@@ -53,6 +54,19 @@
},
}],
],
'conditions':
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
'msvs_target_platform_version' : '<(angle_build_winrt_target_platform_ver)',
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
],
'configurations':
{
'Common_Base':
......
build/common_defines.gypi
......@@ -12,7 +12,6 @@
'angle_build_winrt%': '0',
'angle_build_winphone%': '0',
'angle_build_winrt_app_type_revision%': '8.1',
'conditions':
[
['OS=="linux" and use_x11==1 and chromeos==0', {
......
build/gyp_angle
......@@ -40,7 +40,8 @@ def generateProjects(generate_args):
gyp.main(args)
def generateWinRTProjects(generate_args, generation_dir, build_winphone, msvs_version, app_type_rev):
def generateWinRTProjects(generate_args, generation_dir, build_winphone, msvs_version, app_type_rev,
target_platform_ver):
args = generate_args
appendCommonArgs(args)
......@@ -51,6 +52,7 @@ def generateWinRTProjects(generate_args, generation_dir, build_winphone, msvs_ve
args.append('-Dangle_use_commit_id=1')
args.append('-Dangle_build_winrt=1')
args.append('-Dangle_build_winrt_app_type_revision=' + app_type_rev)
args.append('-Dangle_build_winrt_target_platform_ver=' + target_platform_ver)
args.append('-Dangle_build_winphone=' + ('1' if build_winphone else '0'))
args.append('-Dangle_enable_d3d9=0')
args.append('-Dangle_enable_gl=0')
......@@ -74,10 +76,10 @@ if __name__ == '__main__':
if 'GYP_GENERATE_WINRT' in os.environ:
# Generate Windows 8.1 projects
args = sys.argv[1:]
generateWinRTProjects(args, "winrt/8.1/windows", False, "2013e", "8.1");
generateWinRTProjects(args, "winrt/8.1/windows", False, "2013e", "8.1", "");
args = sys.argv[1:]
generateWinRTProjects(args, "winrt/8.1/windowsphone", True, "2013e", "8.1");
generateWinRTProjects(args, "winrt/8.1/windowsphone", True, "2013e", "8.1", "");
# Generate Windows 10 projects
args = sys.argv[1:]
generateWinRTProjects(args, "winrt/10", False, "2015", "8.2");
generateWinRTProjects(args, "winrt/10", False, "2015", "10.0", "10.0.10240.0");
src/angle.gyp
......@@ -86,15 +86,6 @@
},
'conditions':
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
['OS=="win"',
{
'configurations':
......@@ -127,14 +118,8 @@
[
['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',
{
'msvs_enable_winphone' : '1',
}],
],
},
],
......@@ -176,14 +161,8 @@
[
['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',
{
'msvs_enable_winphone' : '1',
}],
],
}
]
......@@ -214,14 +193,8 @@
[
['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',
{
'msvs_enable_winphone' : '1',
}],
],
}
]
......@@ -259,14 +232,8 @@
}],
['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',
{
'msvs_enable_winphone' : '1',
}],
]
},
], # targets
......
src/compiler.gypi
......@@ -217,18 +217,6 @@
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<@(angle_preprocessor_sources)', ],
'conditions':
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
],
},
{
'target_name': 'translator_lib',
......@@ -259,15 +247,6 @@
},
'conditions':
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
['angle_enable_hlsl==1',
{
'defines':
......@@ -308,18 +287,6 @@
'compiler/translator/ShaderLang.cpp',
'compiler/translator/ShaderVars.cpp'
],
'conditions':
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
],
},
{
......@@ -348,18 +315,6 @@
'compiler/translator/ShaderLang.cpp',
'compiler/translator/ShaderVars.cpp'
],
'conditions':
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
],
},
],
}
src/libEGL.gypi
......@@ -32,8 +32,6 @@
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
'msvs_requires_importlibrary' : 'true',
'msvs_settings':
{
......@@ -44,10 +42,6 @@
}
},
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
],
},
],
......
src/libGLESv2.gypi
......@@ -754,8 +754,6 @@
[
'NTDDI_VERSION=NTDDI_WINBLUE',
],
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
'msvs_requires_importlibrary' : 'true',
'msvs_settings':
{
......@@ -766,10 +764,6 @@
}
},
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
],
},
{
......@@ -789,8 +783,6 @@
[
['angle_build_winrt==1',
{
'msvs_enable_winrt' : '1',
'msvs_application_type_revision' : '<(angle_build_winrt_app_type_revision)',
'msvs_requires_importlibrary' : 'true',
'msvs_settings':
{
......@@ -801,10 +793,6 @@
}
},
}],
['angle_build_winphone==1',
{
'msvs_enable_winphone' : '1',
}],
['OS == "mac"',
{
'all_dependent_settings':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment