X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=f165503afcc2cdb647e549bf1f4857a768333108;hb=b4bd53509869a8fa32749b4cc9a00aae34a12ada;hp=4cbeb7816af966c0fa87764bd0ae4068dc18af00;hpb=9b24380fadc11b19041f1cde6da2ce02b7bf3572;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 4cbeb78..f165503 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.42 2002-06-05 21:11:00 adam Exp $
+# $Id: makefile,v 1.44 2002-07-25 14:19:18 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -23,7 +23,19 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
+
+# expat
+HAVE_EXPAT=1
+EXPAT_DIR= c:\Expat-1.95.4
+
+# iconv
+HAVE_ICONV=1
+ICONV_DIR = c:\libiconv-1.7.0.1
+
+# TCL
+TCL="C:\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
 
 default: all
 
@@ -105,13 +117,39 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
 ############### 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
 
+!if $(HAVE_EXPAT)
+EXPAT_DEF= \
+  /D HAVE_EXPAT_H=1 \
+  /I"$(EXPAT_DIR)\source\lib"
+EXPAT_LIB= \
+  "$(EXPAT_DIR)\libs\libexpat.lib"
+!else
+EXPAT_DEF= \
+  /D HAVE_EXPAT_H=0
+EXPAT_LIB=
+!endif
+  
+  
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
+  $(ICONV_DEF)             \
+  $(EXPAT_DEF)             \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
@@ -151,7 +189,8 @@ LINK=link.exe
 
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
-           wsock32.lib  advapi32.lib
+           wsock32.lib  advapi32.lib \
+           $(ICONV_LIB) $(EXPAT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -168,10 +207,6 @@ ZOOMSH_LINK_OPTIONS = /subsystem:console
 SERVER_LINK_OPTIONS = -lib 
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
-# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
-HAVE_TCL=1
-
 COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
 
 # Final opt variables
@@ -324,7 +359,9 @@ YAZ_RET_OBJS= \
    $(OBJDIR)\d1_tagset.obj\
    $(OBJDIR)\d1_varset.obj\
    $(OBJDIR)\d1_write.obj\
-   $(OBJDIR)\d1_if.obj
+   $(OBJDIR)\d1_if.obj\
+   $(OBJDIR)\d1_expat.obj
+
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -832,7 +869,13 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.42  2002-06-05 21:11:00  adam
+# Revision 1.44  2002-07-25 14:19:18  adam
+# EXPAT support on WIN32
+#
+# Revision 1.43  2002/07/25 13:45:30  adam
+# iconv.dll
+#
+# Revision 1.42  2002/06/05 21:11:00  adam
 # NSIS bz2
 #
 # Revision 1.41  2002/06/04 08:29:53  adam