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
Avoid specifying YAZ4J_DIR for win64
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
b82ddf4
..
9e80ca9
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-53,26
+53,26
@@
YAZ4J_DIR="..\..\yaz4j"
YAZPATH="$(MAKEDIR)\.."
YAZPATH="$(MAKEDIR)\.."
-dist: yaz.win32.nsi yaz.nsi distclean
+dist: yaz.win32.nsi yaz.nsi version.nsi distclean
nmake DEBUG=0 allj
$(NSIS) yaz.win32.nsi
nmake DEBUG=0 allj
$(NSIS) yaz.win32.nsi
-dist64: yaz.win64.nsi yaz.nsi distclean
+dist64: yaz.win64.nsi yaz.nsi version.nsi distclean
nmake make64
$(NSIS) yaz.win64.nsi
make64:
nmake make64
$(NSIS) yaz.win64.nsi
make64:
- nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_INCLUDE=\icu\include ICU_BIN=\icu\bin64 YAZ4J_DIR=..\..\..\yaz4j allj
+ nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_INCLUDE=\icu\include ICU_BIN=\icu\bin64 allj
distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
-nsis: all yaz.win32.nsi
+nsis: all yaz.win32.nsi version.nsi
$(NSIS) yaz.win32.nsi
$(NSIS) yaz.win32.nsi
-nsis64: yaz.win64.nsi
+nsis64: yaz.win64.nsi version.nsi
$(NSIS) yaz.win64.nsi
nsishelp:
$(NSIS) yaz.win64.nsi
nsishelp:
@@
-486,6
+486,7
@@
MISC_OBJS= \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
$(OBJDIR)\opac_to_xml.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
$(OBJDIR)\opac_to_xml.obj \
+ $(OBJDIR)\xml_get.obj \
$(OBJDIR)\xml_add.obj \
$(OBJDIR)\xml_match.obj \
$(OBJDIR)\xml_to_opac.obj \
$(OBJDIR)\xml_add.obj \
$(OBJDIR)\xml_match.obj \
$(OBJDIR)\xml_to_opac.obj \
@@
-874,6
+875,9
@@
$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
@cd $(SRCDIR)
$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
@cd $(SRCDIR)
$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
+version.nsi: $(ROOTDIR)/IDMETA
+ $(TCL) $(SRCDIR)/mk_version.tcl $(ROOTDIR)/IDMETA version.nsi
+
!endif
!endif