Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / angle / build / common.gypi

diff --git a/src/third_party/angle/build/common.gypi b/src/third_party/angle/build/common.gypi
index b35a79e..1fae06b 100644 (file)
--- a/src/third_party/angle/build/common.gypi
+++ b/src/third_party/angle/build/common.gypi
@@ -8,6 +8,8 @@
     {
         'angle_build_tests%': '1',
         'angle_build_samples%': '1',
+        'angle_build_winrt%': '0',
+        'angle_build_winphone%': '0',
         # 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.
@@ -96,18 +98,32 @@
             'Debug_Base':
             {
                 'abstract': 1,
+                'defines':
+                [
+                    '_DEBUG'
+                ],
                 'msvs_settings':
                 {
                     'VCCLCompilerTool':
                     {
                         'Optimization': '0',    # /Od
                         'BasicRuntimeChecks': '3',
-                        'RuntimeLibrary': '1',    # /MTd (debug static)
+                        'RuntimeLibrary': '3',  # /MDd (Debug Multithreaded DLL)
                     },
                     'VCLinkerTool':
                     {
                         'GenerateDebugInformation': 'true',
                         'LinkIncremental': '2',
+                        'conditions':
+                        [
+                            ['angle_build_winrt==1',
+                            {
+                                'AdditionalDependencies':
+                                [
+                                    'dxgi.lib',
+                                ]
+                            }],
+                        ],
                     },
                 },
                 'xcode_settings':
@@ -120,12 +136,16 @@
             'Release_Base':
             {
                 'abstract': 1,
+                'defines':
+                [
+                    'NDEBUG'
+                ],
                 'msvs_settings':
                 {
                     'VCCLCompilerTool':
                     {
                         'Optimization': '2',    # /Os
-                        'RuntimeLibrary': '0',    # /MT (static)
+                        'RuntimeLibrary': '2',  # /MD (Multithreaded DLL)
                     },
                     'VCLinkerTool':
                     {
@@ -143,19 +163,11 @@
                 {
                     'VCLinkerTool':
                     {
-                        'TargetMachine': '1',
-                        'AdditionalLibraryDirectories':
-                        [
-                            '<(windows_sdk_path)/Lib/win8/um/x86',
-                        ],
+                        'TargetMachine': '1', # x86
                     },
                     'VCLibrarianTool':
                     {
-                        'TargetMachine': '1',
-                        'AdditionalLibraryDirectories':
-                        [
-                            '<(windows_sdk_path)/Lib/win8/um/x86',
-                        ],
+                        'TargetMachine': '1', # x86
                     },
                 },
             }, # x86_Base
@@ -169,17 +181,10 @@
                     'VCLinkerTool':
                     {
                         'TargetMachine': '17', # x86 - 64
-                        'AdditionalLibraryDirectories':
-                        [
-                            '<(windows_sdk_path)/Lib/win8/um/x64',
-                        ],
                     },
                     'VCLibrarianTool':
                     {
-                        'AdditionalLibraryDirectories':
-                        [
-                            '<(windows_sdk_path)/Lib/win8/um/x64',
-                        ],
+                        'TargetMachine': '17', # x86 - 64
                     },
                 },
             },    # x64_Base
@@ -195,7 +200,7 @@
             },
             'conditions':
             [
-                [ 'OS == "win" and MSVS_VERSION != "2010e"',
+                ['angle_build_winrt==0 and OS == "win" and MSVS_VERSION != "2010e"',
                 {
                     'Debug_x64':
                     {
@@ -206,6 +211,55 @@
                         'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
                     },
                 }],
+                ['angle_build_winrt==1',
+                {
+                    'arm_Base':
+                    {
+                        'abstract': 1,
+                        'msvs_configuration_platform': 'ARM',
+                        'msvs_settings':
+                        {
+                            'VCLinkerTool':
+                            {
+                                'TargetMachine': '3', # ARM
+                            },
+                            'VCLibrarianTool':
+                            {
+                                'TargetMachine': '3', # ARM
+                            },
+                        },
+                    }, # arm_Base
+                }],
+                ['angle_build_winrt==1 and angle_build_winphone==0',
+                {
+                    'Debug_x64':
+                    {
+                        'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
+                    },
+                    'Release_x64':
+                    {
+                        'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
+                    },
+                    'Debug_ARM':
+                    {
+                        'inherit_from': ['Common_Base', 'arm_Base', 'Debug_Base'],
+                    },
+                    'Release_ARM':
+                    {
+                        'inherit_from': ['Common_Base', 'arm_Base', 'Release_Base'],
+                    },
+                }],
+                ['angle_build_winrt==1 and angle_build_winphone==1',
+                {
+                    'Debug_ARM':
+                    {
+                        'inherit_from': ['Common_Base', 'arm_Base', 'Debug_Base'],
+                    },
+                    'Release_ARM':
+                    {
+                        'inherit_from': ['Common_Base', 'arm_Base', 'Release_Base'],
+                    },
+                }],
             ],
         },    # configurations
     },    # target_defaults
@@ -221,7 +275,11 @@
         { # OS != win
             'target_defaults':
             {
-                'cflags': [ '-fPIC' ],
+                'cflags':
+                [
+                    '-fPIC',
+                    '-std=c++0x',
+                ],
             },
         }],
         ['OS != "win" and OS != "mac"',