projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91e4c64
)
EXPAT support on WIN32
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 25 Jul 2002 14:19:18 +0000
(14:19 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 25 Jul 2002 14:19:18 +0000
(14:19 +0000)
win/makefile
patch
|
blob
|
history
diff --git
a/win/makefile
b/win/makefile
index
488c958
..
f165503
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.44 2002-07-25 14:19:18 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
#
# Programmed by
# HL: Heikki Levanto, Index Data
@@
-25,6
+25,10
@@
DEBUG=1 # 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
# iconv
HAVE_ICONV=1
ICONV_DIR = c:\libiconv-1.7.0.1
@@
-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 \
@@
-340,7
+359,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
+869,10
@@
$(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.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