c/xlsxio
1
0
Fork 0
mirror of https://github.com/brechtsanders/xlsxio synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Brecht Sanders 2018-02-03 14:49:26 +01:00
parent 2c925bffb4
commit 2e238b8ca1
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog.txt
View File

@ -1,3 +1,9 @@
0.2.12
2018-02-03 Brecht Sanders https://github.com/brechtsanders/
* modified Makefile to support WIDE=1 parameter to built UTF-16 library (libxlsxio_readw)
0.2.11
2017-12-31 Brecht Sanders https://github.com/brechtsanders/

11
Makefile
View File

@ -82,6 +82,11 @@ XLSXIOWRITE_LDFLAGS += -static -lz -lbz2
endif
endif
LIBLIST := xlsxio_read xlsxio_write
ifdef WIDE
LIBLIST += xlsxio_readw
endif
CFLAGS_W = $(CFLAGS) -DXML_UNICODE
TOOLS_BIN = xlsxio_xlsx2csv$(BINEXT) xlsxio_csv2xlsx$(BINEXT)
@ -103,9 +108,9 @@ all: static-lib shared-lib tools
%.shared.o: %.c
$(CC) -c -o $@ $< $(SHARED_CFLAGS) $(CFLAGS)
static-lib: $(LIBPREFIX)xlsxio_read$(LIBEXT) $(LIBPREFIX)xlsxio_write$(LIBEXT)
static-lib: $(LIBLIST:%=$(LIBPREFIX)%$(LIBEXT))
shared-lib: $(LIBPREFIX)xlsxio_read$(SOEXT) $(LIBPREFIX)xlsxio_write$(SOEXT)
shared-lib: $(LIBLIST:%=$(LIBPREFIX)%$(SOEXT))
$(LIBPREFIX)xlsxio_read$(LIBEXT): $(XLSXIOREAD_OBJ:%.o=%.static.o)
$(AR) cru $@ $^
@ -119,7 +124,7 @@ $(LIBPREFIX)xlsxio_write$(LIBEXT): $(XLSXIOWRITE_OBJ:%.o=%.static.o)
$(LIBPREFIX)xlsxio_write$(SOEXT): $(XLSXIOWRITE_OBJ:%.o=%.shared.o)
$(CC) -o $@ $(OS_LINK_FLAGS) $^ $(XLSXIOWRITE_SHARED_LDFLAGS) $(XLSXIOWRITE_LDFLAGS) $(LDFLAGS) $(LIBS)
wide: $(LIBPREFIX)xlsxio_readw$(LIBEXT) $(LIBPREFIX)xlsxio_readw$(SOEXT)
#wide: $(LIBPREFIX)xlsxio_readw$(LIBEXT) $(LIBPREFIX)xlsxio_readw$(SOEXT)
%.wstatic.o: %.c
$(CC) -c -o $@ $< $(STATIC_CFLAGS) $(CFLAGS_W)

2
include/xlsxio_version.h
View File

@ -49,7 +49,7 @@ THE SOFTWARE.
/*! \brief minor version number */
#define XLSXIO_VERSION_MINOR 2
/*! \brief micro version number */
#define XLSXIO_VERSION_MICRO 11
#define XLSXIO_VERSION_MICRO 12
/*! @} */
/*! \cond PRIVATE */