diff --git a/3rd/cairo/cairo/cairo-damage-private.h b/3rd/cairo/cairo/cairo-damage-private.h index 97b177e86..66a054d48 100644 --- a/3rd/cairo/cairo/cairo-damage-private.h +++ b/3rd/cairo/cairo/cairo-damage-private.h @@ -38,7 +38,7 @@ #include "cairo-types-private.h" -#include +#include CAIRO_BEGIN_DECLS diff --git a/3rd/cairo/cairo/cairo-image-surface-private.h b/3rd/cairo/cairo/cairo-image-surface-private.h index 2b7921133..b35b9b05a 100644 --- a/3rd/cairo/cairo/cairo-image-surface-private.h +++ b/3rd/cairo/cairo/cairo-image-surface-private.h @@ -41,7 +41,7 @@ #include "cairo-surface-private.h" #include -#include +#include CAIRO_BEGIN_DECLS diff --git a/3rd/cairo/cairo/cairo-pixman-private.h b/3rd/cairo/cairo/cairo-pixman-private.h index d705025c8..812e81181 100644 --- a/3rd/cairo/cairo/cairo-pixman-private.h +++ b/3rd/cairo/cairo/cairo-pixman-private.h @@ -40,7 +40,7 @@ #include "cairo-pixman-private.h" /* keep make check happy */ -#include +#include #if PIXMAN_VERSION < PIXMAN_VERSION_ENCODE(0,22,0) #define pixman_image_composite32 pixman_image_composite diff --git a/3rd/cairo/cairo/cairo-region-private.h b/3rd/cairo/cairo/cairo-region-private.h index 549e50878..fbbe1568c 100644 --- a/3rd/cairo/cairo/cairo-region-private.h +++ b/3rd/cairo/cairo/cairo-region-private.h @@ -42,7 +42,7 @@ #include "cairo-types-private.h" #include "cairo-reference-count-private.h" -#include +#include CAIRO_BEGIN_DECLS diff --git a/3rd/cairo/cairo/cairoint.h b/3rd/cairo/cairo/cairoint.h index 29b844d3a..000372666 100644 --- a/3rd/cairo/cairo/cairoint.h +++ b/3rd/cairo/cairo/cairoint.h @@ -68,7 +68,7 @@ #include #include "cairo.h" -#include +#include #include "cairo-compiler-private.h" #include "cairo-error-private.h" diff --git a/3rd/pixman/pixman/pixman-access.c b/3rd/pixman/pixman/pixman-access.c index 8dfd35f45..b67847dcb 100644 --- a/3rd/pixman/pixman/pixman-access.c +++ b/3rd/pixman/pixman/pixman-access.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-arm-neon.c b/3rd/pixman/pixman/pixman-arm-neon.c index be761c965..eea51cb4e 100644 --- a/3rd/pixman/pixman/pixman-arm-neon.c +++ b/3rd/pixman/pixman/pixman-arm-neon.c @@ -27,7 +27,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-arm-simd.c b/3rd/pixman/pixman/pixman-arm-simd.c index f0d14540b..1c38c5aed 100644 --- a/3rd/pixman/pixman/pixman-arm-simd.c +++ b/3rd/pixman/pixman/pixman-arm-simd.c @@ -24,7 +24,7 @@ * */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-arm.c b/3rd/pixman/pixman/pixman-arm.c index 23374e41c..171ec47b6 100644 --- a/3rd/pixman/pixman/pixman-arm.c +++ b/3rd/pixman/pixman/pixman-arm.c @@ -20,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-bits-image.c b/3rd/pixman/pixman/pixman-bits-image.c index 7bc2ba8af..229cd4588 100644 --- a/3rd/pixman/pixman/pixman-bits-image.c +++ b/3rd/pixman/pixman/pixman-bits-image.c @@ -27,7 +27,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include diff --git a/3rd/pixman/pixman/pixman-combine-float.c b/3rd/pixman/pixman/pixman-combine-float.c index f5145bc9d..366cc08a0 100644 --- a/3rd/pixman/pixman/pixman-combine-float.c +++ b/3rd/pixman/pixman/pixman-combine-float.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-combine32.c b/3rd/pixman/pixman/pixman-combine32.c index 4c484d3e3..a4020faec 100644 --- a/3rd/pixman/pixman/pixman-combine32.c +++ b/3rd/pixman/pixman/pixman-combine32.c @@ -22,7 +22,7 @@ * SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-conical-gradient.c b/3rd/pixman/pixman/pixman-conical-gradient.c index a39e20c4e..f3fbe9371 100644 --- a/3rd/pixman/pixman/pixman-conical-gradient.c +++ b/3rd/pixman/pixman/pixman-conical-gradient.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-edge.c b/3rd/pixman/pixman/pixman-edge.c index ad6dfc4cf..a331b8d60 100644 --- a/3rd/pixman/pixman/pixman-edge.c +++ b/3rd/pixman/pixman/pixman-edge.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-fast-path.c b/3rd/pixman/pixman/pixman-fast-path.c index b4daa2657..38e0fbaeb 100644 --- a/3rd/pixman/pixman/pixman-fast-path.c +++ b/3rd/pixman/pixman/pixman-fast-path.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include diff --git a/3rd/pixman/pixman/pixman-filter.c b/3rd/pixman/pixman/pixman-filter.c index 5f3b752f9..1f415ce96 100644 --- a/3rd/pixman/pixman/pixman-filter.c +++ b/3rd/pixman/pixman/pixman-filter.c @@ -29,7 +29,7 @@ #include #include #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-general.c b/3rd/pixman/pixman/pixman-general.c index 6141cb0a3..4c5d51b28 100644 --- a/3rd/pixman/pixman/pixman-general.c +++ b/3rd/pixman/pixman/pixman-general.c @@ -26,7 +26,7 @@ * SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include diff --git a/3rd/pixman/pixman/pixman-glyph.c b/3rd/pixman/pixman/pixman-glyph.c index 96a349ab4..415f11503 100644 --- a/3rd/pixman/pixman/pixman-glyph.c +++ b/3rd/pixman/pixman/pixman-glyph.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-gradient-walker.c b/3rd/pixman/pixman/pixman-gradient-walker.c index af4df586b..5172b506b 100644 --- a/3rd/pixman/pixman/pixman-gradient-walker.c +++ b/3rd/pixman/pixman/pixman-gradient-walker.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-image.c b/3rd/pixman/pixman/pixman-image.c index 7a851e221..803145825 100644 --- a/3rd/pixman/pixman/pixman-image.c +++ b/3rd/pixman/pixman/pixman-image.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-implementation.c b/3rd/pixman/pixman/pixman-implementation.c index 2c7de4c68..62c2ee5dc 100644 --- a/3rd/pixman/pixman/pixman-implementation.c +++ b/3rd/pixman/pixman/pixman-implementation.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-linear-gradient.c b/3rd/pixman/pixman/pixman-linear-gradient.c index 3f528508a..9bac6c33d 100644 --- a/3rd/pixman/pixman/pixman-linear-gradient.c +++ b/3rd/pixman/pixman/pixman-linear-gradient.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-matrix.c b/3rd/pixman/pixman/pixman-matrix.c index 4032c137a..3dbd368e4 100644 --- a/3rd/pixman/pixman/pixman-matrix.c +++ b/3rd/pixman/pixman/pixman-matrix.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-mips-dspr2.c b/3rd/pixman/pixman/pixman-mips-dspr2.c index 87969ae70..4a2b2c6af 100644 --- a/3rd/pixman/pixman/pixman-mips-dspr2.c +++ b/3rd/pixman/pixman/pixman-mips-dspr2.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-mips.c b/3rd/pixman/pixman/pixman-mips.c index 304881383..7bd9f1bca 100644 --- a/3rd/pixman/pixman/pixman-mips.c +++ b/3rd/pixman/pixman/pixman-mips.c @@ -20,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-mmx.c b/3rd/pixman/pixman/pixman-mmx.c index dec397432..45d9e96f3 100644 --- a/3rd/pixman/pixman/pixman-mmx.c +++ b/3rd/pixman/pixman/pixman-mmx.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #if defined USE_X86_MMX || defined USE_ARM_IWMMXT || defined USE_LOONGSON_MMI diff --git a/3rd/pixman/pixman/pixman-noop.c b/3rd/pixman/pixman/pixman-noop.c index e59890492..11317525e 100644 --- a/3rd/pixman/pixman/pixman-noop.c +++ b/3rd/pixman/pixman/pixman-noop.c @@ -22,7 +22,7 @@ * DEALINGS IN THE SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include diff --git a/3rd/pixman/pixman/pixman-ppc.c b/3rd/pixman/pixman/pixman-ppc.c index a6e7bb0cf..8867bd0a9 100644 --- a/3rd/pixman/pixman/pixman-ppc.c +++ b/3rd/pixman/pixman/pixman-ppc.c @@ -20,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-radial-gradient.c b/3rd/pixman/pixman/pixman-radial-gradient.c index e8e99c98b..616da7440 100644 --- a/3rd/pixman/pixman/pixman-radial-gradient.c +++ b/3rd/pixman/pixman/pixman-radial-gradient.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include diff --git a/3rd/pixman/pixman/pixman-region16.c b/3rd/pixman/pixman/pixman-region16.c index 422f705ce..b008c863e 100644 --- a/3rd/pixman/pixman/pixman-region16.c +++ b/3rd/pixman/pixman/pixman-region16.c @@ -23,7 +23,7 @@ * Author: Soren Sandmann */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #undef PIXMAN_DISABLE_DEPRECATED diff --git a/3rd/pixman/pixman/pixman-region32.c b/3rd/pixman/pixman/pixman-region32.c index 50449a5af..f90c68847 100644 --- a/3rd/pixman/pixman/pixman-region32.c +++ b/3rd/pixman/pixman/pixman-region32.c @@ -23,7 +23,7 @@ * Author: Soren Sandmann */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-solid-fill.c b/3rd/pixman/pixman/pixman-solid-fill.c index 4694ebc70..4dfdc36bc 100644 --- a/3rd/pixman/pixman/pixman-solid-fill.c +++ b/3rd/pixman/pixman/pixman-solid-fill.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman-sse2.c b/3rd/pixman/pixman/pixman-sse2.c index 895510372..e9a3a10bb 100644 --- a/3rd/pixman/pixman/pixman-sse2.c +++ b/3rd/pixman/pixman/pixman-sse2.c @@ -27,7 +27,7 @@ * Based on work by Owen Taylor and Søren Sandmann */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif /* PSHUFD is slow on a lot of old processors, and new processors have SSSE3 */ diff --git a/3rd/pixman/pixman/pixman-ssse3.c b/3rd/pixman/pixman/pixman-ssse3.c index 680d6b95a..b97df76a4 100644 --- a/3rd/pixman/pixman/pixman-ssse3.c +++ b/3rd/pixman/pixman/pixman-ssse3.c @@ -24,7 +24,7 @@ * Author: Soren Sandmann (soren.sandmann@gmail.com) */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-timer.c b/3rd/pixman/pixman/pixman-timer.c index f5ae18e89..e573d6ff4 100644 --- a/3rd/pixman/pixman/pixman-timer.c +++ b/3rd/pixman/pixman/pixman-timer.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-trap.c b/3rd/pixman/pixman/pixman-trap.c index 91766fdbf..9a3529118 100644 --- a/3rd/pixman/pixman/pixman-trap.c +++ b/3rd/pixman/pixman/pixman-trap.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include diff --git a/3rd/pixman/pixman/pixman-utils.c b/3rd/pixman/pixman/pixman-utils.c index 4a3a835c4..fb24fe0a2 100644 --- a/3rd/pixman/pixman/pixman-utils.c +++ b/3rd/pixman/pixman/pixman-utils.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include #include diff --git a/3rd/pixman/pixman/pixman-vmx.c b/3rd/pixman/pixman/pixman-vmx.c index 52de37e69..da85697d2 100644 --- a/3rd/pixman/pixman/pixman-vmx.c +++ b/3rd/pixman/pixman/pixman-vmx.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" #include "pixman-combine32.h" diff --git a/3rd/pixman/pixman/pixman-x86.c b/3rd/pixman/pixman/pixman-x86.c index 0130b7bfa..676099912 100644 --- a/3rd/pixman/pixman/pixman-x86.c +++ b/3rd/pixman/pixman/pixman-x86.c @@ -20,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman.c b/3rd/pixman/pixman/pixman.c index c09b52808..2f5b867cd 100644 --- a/3rd/pixman/pixman/pixman.c +++ b/3rd/pixman/pixman/pixman.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "pixman-private.h" diff --git a/3rd/pixman/pixman/pixman.h b/3rd/pixman/pixman/pixman.h index d644589d6..64675c4f2 100644 --- a/3rd/pixman/pixman/pixman.h +++ b/3rd/pixman/pixman/pixman.h @@ -69,7 +69,7 @@ SOFTWARE. #ifndef PIXMAN_H__ #define PIXMAN_H__ -#include +#include "pixman-version.h" #ifdef __cplusplus #define PIXMAN_BEGIN_DECLS extern "C" { diff --git a/awtk_config.py b/awtk_config.py index 47366017a..7bf55bc9b 100644 --- a/awtk_config.py +++ b/awtk_config.py @@ -38,7 +38,7 @@ if OS_NAME == 'Windows': else: NANOVG_BACKEND='GL3' -#VGCANVAS='CAIRO' +VGCANVAS='CAIRO' #NANOVG_BACKEND='GLES2' #NANOVG_BACKEND='GLES3' #NANOVG_BACKEND='AGG' @@ -178,8 +178,7 @@ CPPPATH=[TK_ROOT, TK_3RD_ROOT, joinPath(TK_SRC, 'ext_widgets'), joinPath(TK_3RD_ROOT, 'pixman'), - joinPath(TK_3RD_ROOT, 'pixman/pixman'), - joinPath(TK_3RD_ROOT, 'cairo/cairo'), + joinPath(TK_3RD_ROOT, 'cairo'), joinPath(TK_3RD_ROOT, 'bgfx/bgfx/include'), joinPath(TK_3RD_ROOT, 'bgfx/bx/include'), joinPath(TK_3RD_ROOT, 'bgfx/bimg/include'), diff --git a/docs/changes.md b/docs/changes.md index 35e23b655..f57fc3e99 100644 --- a/docs/changes.md +++ b/docs/changes.md @@ -1,4 +1,7 @@ # 最新动态 +* 2019/08/15 + * 修改cairo/pixman config.h冲突的问题(感谢陈谭提供补丁) + * 2019/08/14 * 完善文档。 * 增加宏TK\_XML\_MAX\_ATTRS用于控制XML属性的最大个数(缺省24)。 diff --git a/src/vgcanvas/vgcanvas_cairo.c b/src/vgcanvas/vgcanvas_cairo.c index 077cff0b1..bc6be0cc4 100644 --- a/src/vgcanvas/vgcanvas_cairo.c +++ b/src/vgcanvas/vgcanvas_cairo.c @@ -24,7 +24,7 @@ #include "tkc/utf8.h" #include "base/vgcanvas.h" -#include "cairo.h" +#include "cairo/cairo.h" #include "tkc/mem.h" #include "tkc/darray.h"