The correct fix for the lighting filters on Windows: set the GL calling

convention for all targets, not just gpu, since effects now makes GL calls too.

Build fix; unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@4559 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 92113e3..6ccaa46 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -9,6 +9,7 @@
           'SK_BUILD_FOR_WIN32',
           'SK_IGNORE_STDINT_DOT_H',
           '_CRT_SECURE_NO_WARNINGS',
+          'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_settings': {

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 2874054..cabd331 100644 (file)
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -44,7 +44,6 @@
       [ 'skia_os == "win"', {
         'defines': [
           'GR_WIN32_BUILD=1',
-          'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
       }],
     ],