X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=517ee0afee046bb693b990c4890dcdc98f44f494;hp=7ba0dcbf89db19e1e105ccd2efb98f0125dde410;hb=9b1c57318aabdbf8e6d0dc33e3a9848bdf062c64;hpb=df00da5a3dbba000c75781fbb709e3e1cfb0a927

diff --git a/win/makefile b/win/makefile
index 7ba0dcb..517ee0a 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2010 Index Data
+# Copyright (C) 1995-2011 Index Data
 
 # Parameters 
 
@@ -45,14 +45,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"
 
-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=0 HAVE_LIBXML2=0 HAVE_ICONV=0 HAVE_ICU=0
+	$(NSIS) yaz.win64.nsi
+
+distclean:
 	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)
@@ -248,7 +257,8 @@ COMMON_C_OPTIONS=          \
   /Fd"$(OBJDIR)\\" 
 
 COMMON_C_INCLUDES= \
-  /I"$(ROOTDIR)\include"
+  /I"$(ROOTDIR)\include" \
+  /I"$(ROOTDIR)\libstemmer_c\include"
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
@@ -286,7 +296,7 @@ MT=echo
 LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
 	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -470,9 +480,18 @@ MISC_OBJS= \
    $(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)\zoom-event.obj \
+   $(OBJDIR)\zoom-record-cache.obj \
+   $(OBJDIR)\zoom-z3950.obj \
+   $(OBJDIR)\zoom-sru.obj \
+   $(OBJDIR)\zoom-query.obj \
+   $(OBJDIR)\record_render.obj \
+   $(OBJDIR)\facet.obj \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
@@ -486,6 +505,7 @@ MISC_OBJS= \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\rpn2cql.obj \
+   $(OBJDIR)\rpn2solr.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
@@ -504,6 +524,8 @@ MISC_OBJS= \
    $(OBJDIR)\iconv_decode_iso5426.obj \
    $(OBJDIR)\iconv_decode_danmarc.obj \
    $(OBJDIR)\mutex.obj \
+   $(OBJDIR)\thread_create.obj \
+   $(OBJDIR)\spipe.obj \
    $(OBJDIR)\gettimeofday.obj \
    $(OBJDIR)\json.obj \
    $(OBJDIR)\sc.obj \
@@ -542,17 +564,25 @@ Z3950_OBJS= \
    $(OBJDIR)\prt-ext.obj \
    $(OBJDIR)\z-charneg.obj \
    $(OBJDIR)\z-mterm2.obj \
-   $(OBJDIR)\z-oclcui.obj
+   $(OBJDIR)\z-oclcui.obj \
+   $(OBJDIR)\z-facet-1.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.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) \
-   $(ILL_OBJS) \
+   $(ILL_OBJS)
    
 ICU_DLL_OBJS =\
    $(OBJDIR)\icu_chain.obj \
@@ -561,7 +591,9 @@ ICU_DLL_OBJS =\
    $(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
 
@@ -597,6 +629,10 @@ MTERM2_C_FILES = $(Z3950_C_DIR)\z-mterm2.c
 OCLCUI_H_FILES = $(INCLDIR)\yaz\z-oclcui.h
 OCLCUI_C_FILES = $(Z3950_C_DIR)\z-oclcui.c
 
+# Files generated from facet.asn
+FACET_H_FILES = $(INCLDIR)\yaz\z-facet-1.h
+FACET_C_FILES = $(Z3950_C_DIR)\z-facet-1.c
+
 # Files created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -651,6 +687,7 @@ ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
 CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
 MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
 OCLCUI_FILES = $(OCLCUI_C_FILES) $(OCLCUI_H_FILES)
+FACET_FILES = $(FACET_C_FILES) $(FACET_H_FILES)
 
 GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
@@ -661,6 +698,7 @@ GENERATED_C_FILES= \
    $(CHARNEG_C_FILES) \
    $(MTERM2_C_FILES) \
    $(OCLCUI_C_FILES) \
+   $(FACET_C_FILES) \
    $(ILL_CORE_C_FILES) \
    $(ITEM_REQ_C_FILES)
 
@@ -673,6 +711,7 @@ GENERATED_H_FILES= \
    $(CHARNEG_H_FILES) \
    $(MTERM2_H_FILES) \
    $(OCLCUI_H_FILES) \
+   $(FACET_H_FILES) \
    $(ILL_CORE_H_FILES) \
    $(ITEM_REQ_H_FILES)
 
@@ -714,6 +753,15 @@ generate: \
 {$(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)
@@ -758,6 +806,11 @@ $(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
 	$(TCL) $(TCLOPT) -d z.tcl oclcui.asn
 	@cd $(WINDIR)
 
+$(FACET_FILES): $(SRCDIR)\facet.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl facet.asn
+	@cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(SRCDIR)\ill9702.asn
 	@cd $(SRCDIR)
 	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn