Merge pull request #314 from rakuco/webcl-define-only-for-webcl-files

[Blink] WebCL: Only set ENABLE_WEBCL in the relevant files.
crosswalk-project · Jan 29, 2016 · dce3262 · dce3262
2 parents 552b4b9 + 64b4265
commit dce3262
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/third_party/WebKit/Source/build/features.gypi b/third_party/WebKit/Source/build/features.gypi
@@ -52,6 +52,9 @@
       'detailed_memory_infra%': 0,
       'blink_logging_always_on%': 0,
       'link_core_modules_separately%': 1,
+
+      # WebCL support in Crosswalk.
+      'enable_webcl%': 0,
     },
     'conditions': [
       ['use_concatenated_impulse_responses==1', {
@@ -103,6 +106,12 @@
           'LINK_CORE_MODULES_SEPARATELY',
         ],
       }],
+
+      ['enable_webcl==1', {
+        'feature_defines': [
+          'ENABLE_WEBCL=1',
+        ],
+      }],
     ],
 
     # shared build only. If set to 1, link web, core and modules separately.