diff options
| -rw-r--r-- | gyp/SampleApp.gyp | 12 | ||||
| -rw-r--r-- | gyp/debugger.gyp | 12 | ||||
| -rw-r--r-- | gyp/gm.gyp | 14 | ||||
| -rw-r--r-- | gyp/tools.gyp | 12 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp (renamed from debugger/SkDebugCanvas.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.h (renamed from debugger/SkDebugCanvas.h) | 2 | ||||
| -rw-r--r-- | src/utils/debugger/SkDrawCommand.cpp (renamed from debugger/SkDrawCommand.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/debugger/SkDrawCommand.h (renamed from debugger/SkDrawCommand.h) | 2 | ||||
| -rw-r--r-- | src/utils/debugger/SkObjectParser.cpp (renamed from debugger/SkObjectParser.cpp) | 0 | ||||
| -rw-r--r-- | src/utils/debugger/SkObjectParser.h (renamed from debugger/SkObjectParser.h) | 0 |
10 files changed, 27 insertions, 27 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 94dd37b4f1..29787c7ba2 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -16,12 +16,12 @@ 'gmslides.gypi', ], 'sources': [ - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', '../gm/gm.cpp', '../gm/gm.h', diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index fcaa6c67a5..fa7c6f7817 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -85,13 +85,13 @@ '../tools', ], 'sources': [ - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', '../debugger/SkDebugger.cpp', - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', diff --git a/gyp/gm.gyp b/gyp/gm.gyp index 699dcb7b07..2f280afa0d 100644 --- a/gyp/gm.gyp +++ b/gyp/gm.gyp @@ -39,19 +39,19 @@ 'gmslides.gypi', ], 'sources': [ - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', - '../gm/gm.cpp', '../gm/gmmain.cpp', '../gm/system_preferences_default.cpp', '../src/pipe/utils/SamplePipeControllers.h', '../src/pipe/utils/SamplePipeControllers.cpp', + + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 552dfc8b6f..cb7d4ac59b 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -288,12 +288,12 @@ '../tools/filtermain.cpp', '../tools/path_utils.h', '../tools/path_utils.cpp', - '../debugger/SkDrawCommand.h', - '../debugger/SkDrawCommand.cpp', - '../debugger/SkDebugCanvas.h', - '../debugger/SkDebugCanvas.cpp', - '../debugger/SkObjectParser.h', - '../debugger/SkObjectParser.cpp', + '../src/utils/debugger/SkDrawCommand.h', + '../src/utils/debugger/SkDrawCommand.cpp', + '../src/utils/debugger/SkDebugCanvas.h', + '../src/utils/debugger/SkDebugCanvas.cpp', + '../src/utils/debugger/SkObjectParser.h', + '../src/utils/debugger/SkObjectParser.cpp', ], 'dependencies': [ 'skia_lib.gyp:skia_lib', diff --git a/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 199c4c9b0a..199c4c9b0a 100644 --- a/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp diff --git a/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index bcb2bbf028..99df00e3fb 100644 --- a/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -16,7 +16,7 @@ #include "SkTArray.h" #include "SkString.h" -class SkDebugCanvas : public SkCanvas { +class SK_API SkDebugCanvas : public SkCanvas { public: SkDebugCanvas(int width, int height); virtual ~SkDebugCanvas(); diff --git a/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp index c9d9a47da3..c9d9a47da3 100644 --- a/debugger/SkDrawCommand.cpp +++ b/src/utils/debugger/SkDrawCommand.cpp diff --git a/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h index 4b5ab0ac00..f48a79b337 100644 --- a/debugger/SkDrawCommand.h +++ b/src/utils/debugger/SkDrawCommand.h @@ -13,7 +13,7 @@ #include "SkCanvas.h" #include "SkString.h" -class SkDrawCommand { +class SK_API SkDrawCommand { public: /* TODO(chudy): Remove subclasses. */ SkDrawCommand(DrawType drawType); diff --git a/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp index 7004bf0622..7004bf0622 100644 --- a/debugger/SkObjectParser.cpp +++ b/src/utils/debugger/SkObjectParser.cpp diff --git a/debugger/SkObjectParser.h b/src/utils/debugger/SkObjectParser.h index 911b778921..911b778921 100644 --- a/debugger/SkObjectParser.h +++ b/src/utils/debugger/SkObjectParser.h |