X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e2d7192b496dfa4894142b86ff6c59438a518a18;hb=21327f3ee047e0cc77201fb3c2127787dc831ccc;hp=a304a4068ed58dda08129275ad012aee42220377;hpb=02cb6d6ffea2b80351aea040f29053bddebeae0c;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index a304a40..e2d7192 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,12 +1,15 @@
 # Z'mbol/Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.8 2002-03-14 18:41:59 adam Exp $
+# $Id: makefile,v 1.14 2002-08-05 20:05:07 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
-ZMBOL=1
+DEBUG=0   # 0 for release, 1 for debug
+
+# iconv
+HAVE_ICONV=0
+ICONV_DIR = c:\libiconv-1.7.0.1
 
 default: all
 
@@ -50,6 +53,7 @@ DICTDIR=$(SRCDIR)\DICT
 ISAMSDIR=$(SRCDIR)\ISAMS
 ISAMDIR=$(SRCDIR)\ISAM
 ISAMCDIR=$(SRCDIR)\ISAMC
+ISAMBDIR=$(SRCDIR)\ISAMB
 RECCTRLDIR=$(SRCDIR)\RECCTRL
 RSETDIR=$(SRCDIR)\RSET
 UTILDIR=$(SRCDIR)\UTIL
@@ -66,13 +70,8 @@ TEMP=$(TMPDIR)
 ###########################################################
 
 ZEBRALIB=$(LIBDIR)\zebra.lib
-!if $(ZMBOL)
-ZSERVER=$(BINDIR)\zmbolsrv.exe
-ZINDEX=$(BINDIR)\zmbolidx.exe
-!else
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZINDEX=$(BINDIR)\zebraidx.exe
-!endif
 APITEST=$(BINDIR)\apitest.exe
 
 # shortcut names defined here
@@ -85,6 +84,18 @@ apitest: $(APITEST)
 ############### Compiler and linker options 
 ###########################################################
 
+!if $(HAVE_ICONV)
+ICONV_DEF= \
+  /D HAVE_ICONV_H=1 \
+  /I"$(ICONV_DIR)\include"
+ICONV_LIB= \
+  $(ICONV_DIR)\lib\iconv.lib
+!else
+ICONV_DEF= \
+  /D HAVE_ICONV_H=0
+ICONV_LIB=
+!endif
+
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
@@ -93,10 +104,10 @@ COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   /D "WIN32"               \
   /D"_CONSOLE" /D"_MBCS"   \
+  $(ICONV_DEF)             \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
-  /D"ZMBOL=$(ZMBOL)"       \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -134,7 +145,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib
+           wsock32.lib  advapi32.lib $(ICONV_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /machine:i386 \
@@ -182,8 +193,7 @@ ZEBRAIDX_OBJS= \
 APITEST_OBJS= \
 	$(OBJDIR)\apitest.obj
 
-!if $(ZMBOL)
-ZMBOLLIB_OBJS= \
+ZEBRALIB_OBJS= \
 	$(OBJDIR)\isam.obj \
 	$(OBJDIR)\isamc.obj \
 	$(OBJDIR)\isamd.obj \
@@ -192,12 +202,7 @@ ZMBOLLIB_OBJS= \
 	$(OBJDIR)\merge.obj \
 	$(OBJDIR)\merge-d.obj \
 	$(OBJDIR)\physical.obj \
-	$(OBJDIR)\rootblk.obj
-!else
-ZMBOLLIB_OBJS=
-!endif
-ZEBRALIB_OBJS= \
-    $(ZMBOLLIB_OBJS) \
+	$(OBJDIR)\rootblk.obj \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\bfile.obj \
@@ -218,8 +223,6 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\insert.obj \
 	$(OBJDIR)\invstat.obj \
 	$(OBJDIR)\kcompare.obj \
-	$(OBJDIR)\lockidx.obj \
-	$(OBJDIR)\locksrv.obj \
 	$(OBJDIR)\lockutil.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
@@ -258,7 +261,10 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\zrpn.obj \
 	$(OBJDIR)\zsets.obj \
 	$(OBJDIR)\isams.obj \
+	$(OBJDIR)\isamb.obj \
 	$(OBJDIR)\rsisamd.obj \
+	$(OBJDIR)\rsisamb.obj \
+	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\dir.obj \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\extract.obj \
@@ -280,45 +286,47 @@ ALL_OBJS=\
 # source files. Funny way of doing it, but it works.
 
 {$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $<
+	$(CPP) $(COPT) $<
 
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $<
+	$(CPP) $(COPT) $<
 
 # ZebraLib
 {$(INDEXDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(BFILEDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(DFADIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(DICTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(ISAMSDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(ISAMDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(ISAMCDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
+
+{$(ISAMBDIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
 
 {$(RECCTRLDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(RSETDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $< 
 
 {$(APITESTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< 
-
+	$(CPP) $(COPT) $< 
 
 ###########################################################
 ############### Linking
@@ -380,7 +388,7 @@ clean:
 	-del $(OBJDIR)\*.sbr
 	-del $(BINDIR)\*.exe
 	-del $(TMPDIR)\*.
-	-del $(ZEBRALIB)
+	-del $(LIBDIR)\*.lib
 
 ########### check directories and create if needed
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)