X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=5117225b094ec7de8488a80b7e49be2822af3f61;hb=4e8ce154427cf65ff8e76c584a457f5bff23815e;hp=b62f9ffb722b1a766c92af690509ac4c06e9173e;hpb=0232cfff359646b39eb049820faa0df6ca5b79e7;p=pazpar2-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index b62f9ff..5117225 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,10 @@
 # This file is part of Pazpar2.
-# Copyright (C) 2006-2008 Index Data
+# Copyright (C) 2006-2009 Index Data
 
 DEBUG=0   # 0 for release, 1 for debug
-USE_MANIFEST = 0 # Can be enabled Visual Studio 2005
+USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.0.9
+PACKAGE_VERSION=1.1.0
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -12,8 +12,8 @@ YAZ_DIR=..\..\yaz
 # Libxml2 + libxslt + associates
 ZLIB_DIR=\zlib-1.2.3.win32
 ICONV_DIR=\iconv-1.9.2.win32
-LIBXML2_DIR=\libxml2-2.6.28.win32
-LIBXSLT_DIR=\libxslt-1.1.19.win32
+LIBXML2_DIR=\libxml2-2.7.1.win32
+LIBXSLT_DIR=\libxslt-1.1.24.win32
 
 # ICU
 HAVE_ICU=1
@@ -23,10 +23,16 @@ default: all
 
 all: dirs yaz libxslt pazpar2
 
-NSIS="c:\program files\nsis\makensis-bz2.exe"
+NSIS="c:\program files\nsis\makensis.exe"
+
+dist:
+	nmake DEBUG=1 clean
+	nmake DEBUG=0 clean
+	nmake DEBUG=0
+	$(NSIS) pazpar2.nsi
 
 nsis: all
-	$(NSIS) yazpp.nsi
+	$(NSIS) pazpar2.nsi
 
 nsishelp:
 	$(NSIS)
@@ -138,8 +144,7 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
-           wsock32.lib  advapi32.lib \
+LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
            $(YAZ_LIB) $(ICU_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
@@ -170,7 +175,6 @@ PAZPAR2_OBJS = \
    "$(OBJDIR)\http.obj" \
    "$(OBJDIR)\eventl.obj" \
    "$(OBJDIR)\http_command.obj" \
-   "$(OBJDIR)\icu_I18N.obj" \
    "$(OBJDIR)\logic.obj" \
    "$(OBJDIR)\record.obj" \
    "$(OBJDIR)\reclists.obj" \