diff options
| -rw-r--r-- | gyp/tools.gyp | 1 | ||||
| -rw-r--r-- | gyp/utils.gypi | 2 | ||||
| -rw-r--r-- | src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp | 2 | ||||
| -rw-r--r-- | src/utils/win/SkWGL.h (renamed from include/utils/SkWGL.h) | 0 | ||||
| -rw-r--r-- | src/views/win/SkOSWindow_win.cpp | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index bb8be20049..30e3e9ea0d 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -656,7 +656,6 @@ '<(skia_include_path)/utils/win', '<(skia_include_path)/utils/SkDebugUtils.h', '<(skia_include_path)/utils/SkJSONCPP.h', - '<(skia_include_path)/utils/SkWGL.h', '<(skia_include_path)/views/animated', '<(skia_include_path)/views/SkOSWindow_Android.h', '<(skia_include_path)/views/SkOSWindow_iOS.h', diff --git a/gyp/utils.gypi b/gyp/utils.gypi index 5148491054..8ec0807a8c 100644 --- a/gyp/utils.gypi +++ b/gyp/utils.gypi @@ -38,7 +38,6 @@ '<(skia_include_path)/utils/SkRTConf.h', '<(skia_include_path)/utils/SkProxyCanvas.h', '<(skia_include_path)/utils/SkTextBox.h', - '<(skia_include_path)/utils/SkWGL.h', '<(skia_src_path)/utils/SkBase64.cpp', '<(skia_src_path)/utils/SkBase64.h', @@ -127,6 +126,7 @@ '<(skia_src_path)/utils/win/SkDWriteGeometrySink.h', '<(skia_src_path)/utils/win/SkHRESULT.cpp', '<(skia_src_path)/utils/win/SkIStream.cpp', + '<(skia_src_path)/utils/win/SkWGL.h', '<(skia_src_path)/utils/win/SkWGL_win.cpp', #testing diff --git a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp index b53d46ced3..890c7849ba 100644 --- a/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp +++ b/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp @@ -10,7 +10,7 @@ #include <windows.h> #include <GL/GL.h> -#include "SkWGL.h" +#include "win/SkWGL.h" #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/include/utils/SkWGL.h b/src/utils/win/SkWGL.h index d502eb0aa7..d502eb0aa7 100644 --- a/include/utils/SkWGL.h +++ b/src/utils/win/SkWGL.h diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp index 447a5af6cc..315ac2b05a 100644 --- a/src/views/win/SkOSWindow_win.cpp +++ b/src/views/win/SkOSWindow_win.cpp @@ -11,7 +11,7 @@ #include <GL/gl.h> #include <WindowsX.h> -#include "SkWGL.h" +#include "win/SkWGL.h" #include "SkWindow.h" #include "SkCanvas.h" #include "SkOSMenu.h" |