X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=f576a01b2015336d90bb69ffe00f6573a3d9cca6;hb=8e6bdfe54743294add27acc265adae0f6999a9ca;hp=540580796eb4e093436f5b1b0bc655a4e7e5b9f1;hpb=5b2f8d46e7248f45b541500508f40959256e7421;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 5405807..f576a01 100644
--- a/win/makefile
+++ b/win/makefile
@@ -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)
@@ -470,9 +479,17 @@ 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 \
@@ -487,6 +504,7 @@ MISC_OBJS= \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\rpn2cql.obj \
+   $(OBJDIR)\rpn2solr.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \