Join with Zebra 1.3 branch

[idzebra-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index f60ba1f..64f4195 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.25 2003-11-29 16:47:58 adam Exp $
+# $Id: makefile,v 1.29 2004-08-20 12:37:56 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -13,7 +13,7 @@ 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.4
+YAZDIR=$(ROOTDIR)\..\YAZ
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -71,6 +71,18 @@ 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 +177,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)
@@ -212,21 +220,15 @@ APITEST_OBJS= \
        $(OBJDIR)\apitest.obj
 
 ZEBRALIB_OBJS= \
-       $(OBJDIR)\isam.obj \
        $(OBJDIR)\isamc.obj \
-       $(OBJDIR)\isamd.obj \
-       $(OBJDIR)\isutil.obj \
-       $(OBJDIR)\memory.obj \
        $(OBJDIR)\merge.obj \
-       $(OBJDIR)\merge-d.obj \
-       $(OBJDIR)\physical.obj \
-       $(OBJDIR)\rootblk.obj \
        $(OBJDIR)\zebra-lock.obj \
        $(OBJDIR)\attribute.obj \
        $(OBJDIR)\bfile.obj \
        $(OBJDIR)\bset.obj \
        $(OBJDIR)\cfile.obj \
        $(OBJDIR)\charmap.obj \
+       $(OBJDIR)\atoi_zn.obj \
        $(OBJDIR)\close.obj \
        $(OBJDIR)\commit.obj \
        $(OBJDIR)\compact.obj \
@@ -262,11 +264,11 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\rectext.obj \
        $(OBJDIR)\regxread.obj \
        $(OBJDIR)\xmlread.obj \
+       $(OBJDIR)\danbibr.obj \
        $(OBJDIR)\res.obj \
        $(OBJDIR)\retrieve.obj \
        $(OBJDIR)\rsbool.obj \
        $(OBJDIR)\rset.obj \
-       $(OBJDIR)\rsisam.obj \
        $(OBJDIR)\rsisamc.obj \
        $(OBJDIR)\rsm_or.obj \
        $(OBJDIR)\rsnull.obj \
@@ -285,9 +287,9 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\zsets.obj \
        $(OBJDIR)\isams.obj \
        $(OBJDIR)\isamb.obj \
-       $(OBJDIR)\rsisamd.obj \
        $(OBJDIR)\rsisamb.obj \
        $(OBJDIR)\rsbetween.obj \
+       $(OBJDIR)\rsprox.obj \
        $(OBJDIR)\dir.obj \
        $(OBJDIR)\dirs.obj \
        $(OBJDIR)\extract.obj \
@@ -432,7 +434,6 @@ clean:
        -del $(OBJDIR)\*.obj
        -del $(OBJDIR)\*.sbr
        -del $(BINDIR)\*.exe
-       -del $(BINDIR)\*.dll
        -del $(TMPDIR)\*.
        -del $(LIBDIR)\*.lib