projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #815: Extended Services "delete" requires a dummy "record" to
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
aa117c6
..
b2ea8df
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.60 2006-11-24 19:48:23 adam Exp $
+# $Id: makefile,v 1.62 2006-12-15 21:11:37 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-159,7
+159,7
@@
iconv:
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
@@
-321,6
+321,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\bfile.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
$(OBJDIR)\bfile.obj \
$(OBJDIR)\bset.obj \
$(OBJDIR)\cfile.obj \
+ $(OBJDIR)\check_res.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \
$(OBJDIR)\charmap.obj \
$(OBJDIR)\close.obj \
$(OBJDIR)\commit.obj \