skia/skia.gyp - Issue 1260253003: gpu: Add calling convention for win32

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/skia.gyp

Issue 1260253003: gpu: Add calling convention for win32 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: another merge Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: skia/skia.gyp

diff --git a/skia/skia.gyp b/skia/skia.gyp

index ca063d13be3b819a64537602367ced72bd59d7cb..eea745ca2780e732e0efd47b8e544b0c6ff919d3 100644

--- a/skia/skia.gyp

+++ b/skia/skia.gyp

@@ -38,6 +38,15 @@

'skia_library',

'skia_chrome',

+ 'direct_dependent_settings': {

+ 'conditions': [

+ [ 'OS == "win"', {

+ 'defines': [

+ 'GR_GL_FUNCTION_TYPE=__stdcall',

+ ],

+ }],

+ ],

+ },

{

'target_name': 'skia_chrome',

@@ -70,6 +79,13 @@

'GR_GL_IGNORE_ES3_MSAA=0',

'direct_dependent_settings': {

+ 'conditions': [

+ [ 'OS == "win"', {

+ 'defines': [

+ 'GR_GL_FUNCTION_TYPE=__stdcall',

+ ],

+ }],

+ ],

'defines': [

'SKIA_DLL',

'GR_GL_IGNORE_ES3_MSAA=0',

« no previous file with comments | « skia/BUILD.gn ('k') | skia/skia_common.gypi » ('j') | no next file with comments »