浏览代码

Merge branch 'dev' of https://github.com/viest/php-ext-excel-export into dev

viest 6 年之前
父节点
当前提交
7953979b93
共有 3 个文件被更改,包括 2 次插入3 次删除
  1. 0 2
      .travis.yml
  2. 1 0
      README.md
  3. 1 1
      config.m4

+ 0 - 2
.travis.yml

@@ -17,8 +17,6 @@ notifications:
 
 
 before_script:
 before_script:
   - sudo apt-get install zlib1g-dev -y
   - sudo apt-get install zlib1g-dev -y
-  - git clone https://github.com/jmcnamara/libxlsxwriter.git
-  - make -C ./libxlsxwriter && sudo make -C ./libxlsxwriter install
   - phpize && ./configure && make clean && make
   - phpize && ./configure && make clean && make
 
 
 branches:
 branches:

+ 1 - 0
README.md

@@ -1,6 +1,7 @@
 ![php-excel](https://github.com/viest/php-excel-writer/blob/master/resource/logo.png)
 ![php-excel](https://github.com/viest/php-excel-writer/blob/master/resource/logo.png)
 
 
 [![Build Status](https://travis-ci.org/viest/php-ext-excel-export.svg?branch=master)](https://travis-ci.org/viest/php-ext-excel-export)
 [![Build Status](https://travis-ci.org/viest/php-ext-excel-export.svg?branch=master)](https://travis-ci.org/viest/php-ext-excel-export)
+[![Build status](https://ci.appveyor.com/api/projects/status/w4cfjo9e4gsrs6rn/branch/master?svg=true)](https://ci.appveyor.com/project/viest/php-ext-excel-export/branch/master)
 
 
 #### Why use xlswriter
 #### Why use xlswriter
 
 

+ 1 - 1
config.m4

@@ -16,7 +16,7 @@ if test "$PHP_XLSWRITER" != "no"; then
     library/src/core.c \
     library/src/core.c \
     library/src/custom.c \
     library/src/custom.c \
     library/src/drawing.c \
     library/src/drawing.c \
-    library/src/format.c \
+    library/src/xlsx_format.c \
     library/src/hash_table.c \
     library/src/hash_table.c \
     library/src/packager.c \
     library/src/packager.c \
     library/src/relationships.c \
     library/src/relationships.c \