X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b4594b1d197fe8ac854b6339d7a2811908209439;hb=32680f78589487a3d1ab3d9753d20f6ea305286b;hp=74bd2b63cd3ede310b74bebae8b681499584c509;hpb=ffb6aaba033b87c9e2e4d32e1f84f88bc6679e1f;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 74bd2b6..b4594b1 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.21 2003-02-23 22:52:15 adam Exp $
+# $Id: makefile,v 1.25.2.2 2004-08-19 12:51:43 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -9,11 +9,11 @@ DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.4
+EXPAT_DIR= c:\Expat-1.95.7
 
 # iconv is optional
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.8.win32
+ICONV_DIR = c:\iconv-1.9.1.win32
 
 default: all
 
@@ -27,7 +27,7 @@ all: dirs zebralib zserver zindex
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ-2.0
+YAZDIR=$(ROOTDIR)\..\YAZ
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -71,6 +71,19 @@ TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 TEMP=$(TMPDIR)
 
+# NSIS
+NSIS="c:\program files\nsis\makensis.exe"
+
+dist:
+	nmake DEBUG=1 clean
+	nmake DEBUG=0 clean
+	nmake DEBUG=0
+	$(NSIS) zebra.nsi
+
+
+nsis:
+	$(NSIS) zebra.nsi
+
 ###########################################################
 ############### Targets - what to make
 ###########################################################
@@ -165,21 +178,17 @@ LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
            wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo \
-                    /machine:i386 \
-				    /incremental:no
-
-#                    /subsystem:windows \
+COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
-RELEASE_LNK_OPTIONS=  /pdb:none
+RELEASE_LNK_OPTIONS= 
 
-ZEBRALIB_LINK_OPTIONS = -lib 
+ZEBRALIB_LINK_OPTIONS= -lib 
 
-ZSERVER_LINK_OPTIONS = /subsystem:console  
-ZINDEX_LINK_OPTIONS = /subsystem:console  
-APITEST_LINK_OPTIONS = /subsystem:console  
+ZSERVER_LINK_OPTIONS= /subsystem:console  
+ZINDEX_LINK_OPTIONS= /subsystem:console  
+APITEST_LINK_OPTIONS= /subsystem:console  
 
 # Final opt variables
 !if $(DEBUG)
@@ -246,10 +255,14 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
 	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\marcomp.obj \
+	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
 	$(OBJDIR)\passwddb.obj \
+	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\livcode.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -258,6 +271,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rectext.obj \
 	$(OBJDIR)\regxread.obj \
 	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\danbibr.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
 	$(OBJDIR)\rsbool.obj \
@@ -284,6 +298,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rsisamd.obj \
 	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsbetween.obj \
+	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\dir.obj \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\extract.obj \