Fix standalone compilation on Linux

Use a "gyp trick" to define a default value for use_x11, thanks goes to kbr for remembering the other instance of this trick. BUG=angleproject:892 Change-Id: Ifb64af4e56d9eb90993760a495008d95dd31ae3d Reviewed-on: https://chromium-review.googlesource.com/278158Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Fix standalone compilation on Linux
fd0957d9 · Corentin Wallez · 2539fffa · fd0957d9
Commit fd0957d9 authored Jun 17, 2015 by Corentin Wallez
Show whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

angle.gyp src/angle.gyp +18 -0

No files found.
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -17,6 +17,24 @@
        'angle_enable_d3d11%': 0,
        'angle_enable_gl%': 0,
        'angle_enable_hlsl%': 0,
+        # This nested dictionary hack comes from Chromium's build/common.gypi
+        # and is needed so we can both set a default value for this variable and
+        # test it in the same file.
+        'variables':
+        {
+            'conditions':
+            [
+                ['OS=="linux"',
+                {
+                    'use_x11%': 1,
+                },
+                {
+                    'use_x11%': 0,
+                }],
+            ],
+        },
+        # Copy conditionally-set variables out one scope.
+        'use_x11%': '<(use_x11)',
        'conditions':
        [
            ['OS=="win"',