X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=f3998ea96c61495acd9e211a5a30511c034a0075;hb=dfa3f5aa5c191a7e528e09789fce3d82d62c8e51;hp=0be60e8420eed047c1dac214cb045d4336fe0d3b;hpb=e9ed8f920f4af7c34a4bac81b4c7a4db023fa9ae;p=pazpar2-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 0be60e8..f3998ea 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,23 +1,24 @@
 # This file is part of Pazpar2.
-# Copyright (C) 2006-2013 Index Data
+# Copyright (C) Index Data
+# See the file LICENSE for details.
 
 DEBUG=0   # 0 for release, 1 for debug
-USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008
+USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.6.23
+PACKAGE_VERSION=1.8.8
 
 # YAZ
 YAZ_DIR=..\..\yaz
 
 # Libxml2 + libxslt + associates
-ZLIB_DIR=\zlib-1.2.3.win32
-ICONV_DIR=\iconv-1.9.2.win32
-LIBXML2_DIR=\libxml2-2.7.6.win32
-LIBXSLT_DIR=\libxslt-1.1.26.win32
+LIBXML2_DIR=\libxml2-2.9.2.win32
+LIBXSLT_DIR=\libxslt-1.1.28.win32
 
 # ICU
 HAVE_ICU=1
 ICU_DIR=c:\icu
+ICU_LIB=$(ICU_DIR)\lib
+ICU_INCLUDE=$(ICU_DIR)\include
 
 default: all
 
@@ -59,19 +60,19 @@ pazpar2: $(PAZPAR2_EXE)
 
 YAZBINDIR=$(YAZ_DIR)\bin
 !if $(DEBUG)
-YAZ_LIB="$(YAZ_DIR)\lib\yaz4d.lib" "$(YAZ_DIR)\lib\yaz_cond4d.lib" 
+YAZ_LIB="$(YAZ_DIR)\lib\yaz5d.lib" "$(YAZ_DIR)\lib\yaz_cond5d.lib" 
 !if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4d.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5d.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll"
 !else
-YAZ_LIB="$(YAZ_DIR)\lib\yaz4.lib" "$(YAZ_DIR)\lib\yaz_cond4.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\yaz5.lib" "$(YAZ_DIR)\lib\yaz_cond5.lib"
 !if $(HAVE_ICU)
-YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu4.lib"
+YAZ_LIB=$(YAZ_LIB) "$(YAZ_DIR)\lib\yaz_icu5.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz4.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5.dll"
 !endif
 
 YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"
@@ -79,31 +80,27 @@ YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"
 # Copy libxslt and associates to our bin directory
 libxslt: $(BINDIR)\libxslt.dll
 
-$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\bin\libxslt.dll"
-	copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
-	copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
+$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\lib\libxslt.dll"
 	copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-	copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+	copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
 
 
 LIBXSLT_DEF= \
-	    /I"$(ICONV_DIR)\include" \
-	    /I"$(LIBXML2_DIR)\include" \
+	    /I"$(LIBXML2_DIR)\include\libxml2" \
 	    /I"$(LIBXSLT_DIR)\include"
 
 LIBXSLT_LIB = \
-	   "$(ICONV_DIR)\lib\iconv.lib" \
 	   "$(LIBXML2_DIR)\lib\libxml2.lib" \
 	   "$(LIBXSLT_DIR)\lib\libxslt.lib"
 
 !if $(HAVE_ICU)
-ICU_DEF=/DYAZ_HAVE_ICU=1 /I"$(ICU_DIR)\include"
-ICU_LIB= $(ICU_DIR)\lib\icudt.lib \
-	 $(ICU_DIR)\lib\icuin.lib \
-	 $(ICU_DIR)\lib\icuuc.lib
+ICU_DEF=/DYAZ_HAVE_ICU=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= $(ICU_LIB)\icudt.lib \
+	 $(ICU_LIB)\icuin.lib \
+	 $(ICU_LIB)\icuuc.lib
 !else
 ICU_DEF=/DYAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_LIBS=
 !endif
 
 COMMON_C_OPTIONS=          \
@@ -153,9 +150,9 @@ RELEASE_C_OPTIONS=  \
 LINK=link.exe
 
 LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
-           $(YAZ_LIB) $(ICU_LIB) $(LIBXSLT_LIB)
+           $(YAZ_LIB) $(ICU_LIBS) $(LIBXSLT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug