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
Use VS 2008 for NSI
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
90d8e97
..
3815beb
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,8
+1,5
@@
# 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
# Parameters
@@
-25,11
+22,11
@@
ICU_DIR = c:\icu
# libxslt
HAVE_LIBXSLT=1
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.24.win32
+LIBXSLT_DIR=c:\libxslt-1.1.26.win32
# libxml2
HAVE_LIBXML2=1
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.1.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.win32
# zlib compression (used by libxml2)
ZLIB_DIR = c:\zlib-1.2.3.win32
# zlib compression (used by libxml2)
ZLIB_DIR = c:\zlib-1.2.3.win32
@@
-48,13
+45,13
@@
all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
-dist:
+dist: yaz.nsi
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=0
$(NSIS) yaz.nsi
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=0
$(NSIS) yaz.nsi
-nsis:
+nsis: all yaz.nsi
$(NSIS) yaz.nsi
nsishelp:
$(NSIS) yaz.nsi
nsishelp:
@@
-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
@@
-172,15
+169,15
@@
ICU_DEF= \
/I"$(ICU_DIR)\include"
ICU_LIB= \
$(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
/I"$(ICU_DIR)\include"
ICU_LIB= \
$(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
+icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
yazicu: dirs generate $(YAZ_ICU)
yazicu: dirs generate $(YAZ_ICU)
-$(BINDIR)\icudt40.dll:
- copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
-$(BINDIR)\icuin40.dll:
- copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
-$(BINDIR)\icuuc40.dll:
- copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
+$(BINDIR)\icudt42.dll:
+ copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR)
+$(BINDIR)\icuin42.dll:
+ copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR)
+$(BINDIR)\icuuc42.dll:
+ copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR)
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
@@
-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,6
+495,7
@@
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)\json.obj \
$(OBJDIR)\sc.obj
Z3950_OBJS= \
$(OBJDIR)\sc.obj
Z3950_OBJS= \
@@
-544,7
+541,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