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
yaz-ztest: use built-in array for MARC always
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
f6a124f
..
86c2458
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,13
+1,10
@@
# This file is part of the YAZ toolkit.
# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2009 Index Data
-#
-# Programmed by
-# Heikki Levanto & Adam Dickmeiss
+# Copyright (C) 1995-2010 Index Data
# Parameters
DEBUG=0 # 0 for release, 1 for debug
# Parameters
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 0
+USE_MANIFEST = 1
# TCL
TCL="C:\Tcl\bin\tclsh85.exe"
# TCL
TCL="C:\Tcl\bin\tclsh85.exe"
@@
-91,15
+88,15
@@
TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
# Targets - what to make
!if $(DEBUG)
-YAZ_DLL=$(BINDIR)\yaz3d.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3d.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3d.lib
+YAZ_DLL=$(BINDIR)\yaz4d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
!else
!else
-YAZ_DLL=$(BINDIR)\yaz3.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3.lib
+YAZ_DLL=$(BINDIR)\yaz4.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
!endif
CLIENT=$(BINDIR)\yaz-client.exe
@@
-447,7
+444,6
@@
MISC_OBJS= \
$(OBJDIR)\iso5426.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
$(OBJDIR)\iso5426.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
- $(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\diagsru_update.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\diagsru_update.obj \
@@
-499,7
+495,11
@@
MISC_OBJS= \
$(OBJDIR)\iconv_decode_iso5426.obj \
$(OBJDIR)\iconv_decode_danmarc.obj \
$(OBJDIR)\mutex.obj \
$(OBJDIR)\iconv_decode_iso5426.obj \
$(OBJDIR)\iconv_decode_danmarc.obj \
$(OBJDIR)\mutex.obj \
- $(OBJDIR)\sc.obj
+ $(OBJDIR)\json.obj \
+ $(OBJDIR)\sc.obj \
+ $(OBJDIR)\xml_include.obj \
+ $(OBJDIR)\file_glob.obj \
+ $(OBJDIR)\dirent.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-544,7
+544,13
@@
DLL_OBJS =\
$(ILL_OBJS) \
ICU_DLL_OBJS =\
$(ILL_OBJS) \
ICU_DLL_OBJS =\
- $(OBJDIR)\icu_I18N.obj
+ $(OBJDIR)\icu_chain.obj \
+ $(OBJDIR)\icu_utf16.obj \
+ $(OBJDIR)\icu_utf8.obj \
+ $(OBJDIR)\icu_transform.obj \
+ $(OBJDIR)\icu_casemap.obj \
+ $(OBJDIR)\icu_tokenizer.obj \
+ $(OBJDIR)\icu_sortkey.obj
# Generated C and H files
# Generated C and H files
@@
-779,7
+785,7
@@
$(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
@cd $(SRCDIR)
$(TCL) csvtosru_update.tcl $(SRCDIR)
@cd $(SRCDIR)
$(TCL) csvtosru_update.tcl $(SRCDIR)
-$(INCLDIR)\yaz\yaz-version.h:
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/configure.ac
@cd $(SRCDIR)
$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
@cd $(SRCDIR)
$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h