projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
siconv added
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
488c958
..
2e519fe
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# makefile.mak - makefile for MS NMAKE
# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.43 2002-07-25 13:45:30 adam Exp $
+# $Id: makefile,v 1.45 2002-08-27 22:33:30 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
#
# Programmed by
# HL: Heikki Levanto, Index Data
@@
-25,12
+25,16
@@
DEBUG=1 # 0 for release, 1 for debug
DEBUG=1 # 0 for release, 1 for debug
+# expat
+HAVE_EXPAT=0
+EXPAT_DIR= c:\Expat-1.95.4
+
# iconv
# iconv
-HAVE_ICONV=1
+HAVE_ICONV=0
ICONV_DIR = c:\libiconv-1.7.0.1
# TCL
ICONV_DIR = c:\libiconv-1.7.0.1
# TCL
-TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\program files\Tcl\bin\tclsh83.exe"
HAVE_TCL=1
default: all
HAVE_TCL=1
default: all
@@
-124,6
+128,19
@@
ICONV_DEF= \
/D HAVE_ICONV_H=0
ICONV_LIB=
!endif
/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
### C and CPP compiler (the same thing)
# Note: $(CPP) has already been defined in the environment
@@
-132,6
+149,7
@@
ICONV_LIB=
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
$(ICONV_DEF) \
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
$(ICONV_DEF) \
+ $(EXPAT_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
@@
-171,7
+189,8
@@
LINK=link.exe
LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
advapi32.lib uuid.lib \
LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
advapi32.lib uuid.lib \
- wsock32.lib advapi32.lib $(ICONV_LIB)
+ wsock32.lib advapi32.lib \
+ $(ICONV_LIB) $(EXPAT_LIB)
COMMON_LNK_OPTIONS= /nologo \
/subsystem:windows \
COMMON_LNK_OPTIONS= /nologo \
/subsystem:windows \
@@
-308,7
+327,9
@@
YAZ_UTIL_OBJS= \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\xmalloc.obj \
- $(OBJDIR)\matchstr.obj
+ $(OBJDIR)\matchstr.obj \
+ $(OBJDIR)\siconv.obj
+
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
@@
-340,7
+361,9
@@
YAZ_RET_OBJS= \
$(OBJDIR)\d1_tagset.obj\
$(OBJDIR)\d1_varset.obj\
$(OBJDIR)\d1_write.obj\
$(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\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-848,7
+871,13
@@
$(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
###########################################################
#
# $Log: makefile,v $
###########################################################
#
# $Log: makefile,v $
-# Revision 1.43 2002-07-25 13:45:30 adam
+# Revision 1.45 2002-08-27 22:33:30 adam
+# siconv added
+#
+# 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
# iconv.dll
#
# Revision 1.42 2002/06/05 21:11:00 adam