Add a zlib target that the pdf target can depend on.
- make drawTextOnPath (now used by shadertext) a non fatal NOT_IMPLEMENTED on PDF.
Review URL: http://codereview.appspot.com/4631071
git-svn-id: http://skia.googlecode.com/svn/trunk@1722 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/core.gyp b/gyp/core.gyp
index c02d1f5..4cc0252 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -69,7 +69,6 @@
'../src/core/SkFP.h',
'../src/core/SkFilterProc.cpp',
'../src/core/SkFilterProc.h',
- '../src/core/SkFlate.cpp',
'../src/core/SkFlattenable.cpp',
'../src/core/SkFloat.cpp',
'../src/core/SkFloat.h',
@@ -187,7 +186,6 @@
'../include/core/SkEndian.h',
'../include/core/SkFDot6.h',
'../include/core/SkFixed.h',
- '../include/core/SkFlate.h',
'../include/core/SkFlattenable.h',
'../include/core/SkFloatBits.h',
'../include/core/SkFloatingPoint.h',
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 59aba08..eb1dea0 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -49,6 +49,9 @@
'../include/pdf',
],
},
+ 'dependencies': [
+ 'zlib.gyp:zlib',
+ ],
},
],
}
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
new file mode 100644
index 0000000..d47a13e
--- /dev/null
+++ b/gyp/zlib.gyp
@@ -0,0 +1,40 @@
+{
+ 'includes': [
+ 'target_defaults.gypi',
+ ],
+ 'targets': [
+ {
+ 'target_name': 'zlib',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '../include/config',
+ '../include/core',
+ ],
+ 'sources': [
+ '../include/core/SkFlate.h',
+
+ '../src/core/SkFlate.cpp',
+ ],
+ 'conditions': [
+ [ 'OS == "mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/usr/lib/libz.dylib',
+ ],
+ },
+ 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+ }],
+ [ 'OS == "linux"', {
+ 'link_settings': { 'libraries': [ '-lz', ], },
+ 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+ }],
+ ],
+ },
+ ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 8ead3c8..bd94471 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -926,7 +926,7 @@
if (d.fClip->isEmpty()) {
return;
}
- NOT_IMPLEMENTED("drawTextOnPath", true);
+ NOT_IMPLEMENTED("drawTextOnPath", false);
}
void SkPDFDevice::drawVertices(const SkDraw& d, SkCanvas::VertexMode,