Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: gyp/gpu.gyp

Issue 2233883002: Default GR_GL_FUNCTION_TYPE to __stdcall on Windows. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_conditions.gypi ('k') | include/gpu/gl/GrGLConfig.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/gpu.gyp
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index c17789ab7a7f3de09941a74a2a2354ebd0dcfdf2..a2909b802435c691ec99851e887fe9fdb3d3d6b3 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -65,13 +65,6 @@
}],
],
'direct_dependent_settings': {
- 'conditions': [
- [ 'skia_os == "win"', {
- 'defines': [
- 'GR_GL_FUNCTION_TYPE=__stdcall',
- ],
- }],
- ],
'include_dirs': [
'../include/gpu',
],
@@ -251,7 +244,7 @@
# the gyp -> android.mk generator doesn't seem to like cpp files
# in directories outside of src, bench, or dm. Until this gets fixed
# I just start the path in the src directory.
- '<(skia_src_path)/../tools/viewer/sk_app/WindowContext.cpp',
+ '<(skia_src_path)/../tools/viewer/sk_app/WindowContext.cpp',
'<(skia_src_path)/../tools/viewer/sk_app/VulkanWindowContext.cpp',
'<(skia_src_path)/../tools/viewer/sk_app/android/VulkanWindowContext_android.cpp'
],
« no previous file with comments | « gyp/common_conditions.gypi ('k') | include/gpu/gl/GrGLConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698