projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code a little to avoid clang warnings
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
8df6c5e
..
b850872
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# This file is part of the YAZ toolkit.
# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2010 Index Data
+# Copyright (C) 1995-2011 Index Data
# Parameters
# Parameters
@@
-18,7
+18,9
@@
ICONV_DIR = c:\iconv-1.9.2.win32
# icu charcter conversion utility
# get icu libraries from http://www.icu-project.org
HAVE_ICU=1
# icu charcter conversion utility
# get icu libraries from http://www.icu-project.org
HAVE_ICU=1
-ICU_DIR = c:\icu
+ICU_LIB = c:\icu\lib
+ICU_BIN = c:\icu\bin
+ICU_INCLUDE = c:\icu\include
# libxslt
HAVE_LIBXSLT=1
# libxslt
HAVE_LIBXSLT=1
@@
-45,14
+47,23
@@
all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
-dist: yaz.nsi
+dist: yaz.win32.nsi yaz.nsi distclean
+ nmake DEBUG=0
+ $(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+ nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64
+ $(NSIS) yaz.win64.nsi
+
+distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=0
- $(NSIS) yaz.nsi
-nsis: all yaz.nsi
- $(NSIS) yaz.nsi
+nsis: all yaz32.nsi
+ $(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+ $(NSIS) yaz.win64.nsi
nsishelp:
$(NSIS)
nsishelp:
$(NSIS)
@@
-170,23
+181,22
@@
iconv:
!if $(HAVE_ICU)
ICU_DEF= \
!if $(HAVE_ICU)
ICU_DEF= \
- /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 \
- /I"$(ICU_DIR)\include"
-ICU_LIB= \
- $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
+ /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= \
+ $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
yazicu: dirs generate $(YAZ_ICU)
$(BINDIR)\icudt42.dll:
icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
yazicu: dirs generate $(YAZ_ICU)
$(BINDIR)\icudt42.dll:
- copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR)
+ copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
$(BINDIR)\icuin42.dll:
$(BINDIR)\icuin42.dll:
- copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR)
+ copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
$(BINDIR)\icuuc42.dll:
$(BINDIR)\icuuc42.dll:
- copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR)
+ copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_LIBS=
icu:
yazicu:
!endif
icu:
yazicu:
!endif
@@
-248,7
+258,8
@@
COMMON_C_OPTIONS= \
/Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
/Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
- /I"$(ROOTDIR)\include"
+ /I"$(ROOTDIR)\include" \
+ /I"$(ROOTDIR)\libstemmer_c\include"
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
@@
-470,14
+481,17
@@
MISC_OBJS= \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
+ $(OBJDIR)\solr.obj \
+ $(OBJDIR)\solrtransform.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-event.obj \
$(OBJDIR)\zoom-record-cache.obj \
$(OBJDIR)\zoom-z3950.obj \
$(OBJDIR)\zoom-sru.obj \
$(OBJDIR)\zoom-query.obj \
$(OBJDIR)\zoom-record-cache.obj \
$(OBJDIR)\zoom-z3950.obj \
$(OBJDIR)\zoom-sru.obj \
$(OBJDIR)\zoom-query.obj \
- $(OBJDIR)\record-render.obj \
+ $(OBJDIR)\record_render.obj \
$(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
@@
-492,6
+506,7
@@
MISC_OBJS= \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\rpn2cql.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\rpn2cql.obj \
+ $(OBJDIR)\rpn2solr.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
@@
-558,10
+573,17
@@
ILL_OBJS= \
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
+STEMMER_OBJS = \
+ $(OBJDIR)\libstemmer.obj \
+ $(OBJDIR)\api.obj \
+ $(OBJDIR)\utilities.obj \
+ $(OBJDIR)\stem_UTF_8_porter.obj \
+ $(OBJDIR)\stem_UTF_8_english.obj
+
DLL_OBJS =\
$(MISC_OBJS) \
$(Z3950_OBJS) \
DLL_OBJS =\
$(MISC_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS) \
+ $(ILL_OBJS)
ICU_DLL_OBJS =\
$(OBJDIR)\icu_chain.obj \
ICU_DLL_OBJS =\
$(OBJDIR)\icu_chain.obj \
@@
-570,7
+592,9
@@
ICU_DLL_OBJS =\
$(OBJDIR)\icu_transform.obj \
$(OBJDIR)\icu_casemap.obj \
$(OBJDIR)\icu_tokenizer.obj \
$(OBJDIR)\icu_transform.obj \
$(OBJDIR)\icu_casemap.obj \
$(OBJDIR)\icu_tokenizer.obj \
- $(OBJDIR)\icu_sortkey.obj
+ $(OBJDIR)\icu_sortkey.obj \
+ $(OBJDIR)\stemmer.obj \
+ $(STEMMER_OBJS)
# Generated C and H files
# Generated C and H files
@@
-730,6
+754,15
@@
generate: \
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
+{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
# ASN-generated files
!if $(HAVE_TCL)
# ASN-generated files
!if $(HAVE_TCL)
@@
-862,7
+895,7
@@
$(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
$(MT) -manifest $@.manifest -outputresource:$@;2
$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
$(MT) -manifest $@.manifest -outputresource:$@;2
$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
- $(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
+ $(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
$(ICU_DLL_OBJS) \
$(YAZ_ICU_RES) \
/out:$@ \
$(ICU_DLL_OBJS) \
$(YAZ_ICU_RES) \
/out:$@ \
@@
-882,7
+915,7
@@
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
$(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
- $(LINK_PROGRAM) $(ICU_LIB) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
+ $(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
$(MT) -manifest $@.manifest -outputresource:$@;1