From 729e5401fb7062abce50e13d4249132c3a911600 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 11 Dec 2014 19:20:02 +0100 Subject: [PATCH] Update for VS 2013 --- win/makefile | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/win/makefile b/win/makefile index 104a2c4..0eb4cca 100644 --- a/win/makefile +++ b/win/makefile @@ -3,7 +3,7 @@ # 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.8.4 @@ -11,10 +11,8 @@ PACKAGE_VERSION=1.8.4 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 @@ -80,20 +78,16 @@ 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" @@ -101,7 +95,7 @@ LIBXSLT_LIB = \ 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_DIR)\lib64\icuuc.lib !else ICU_DEF=/DYAZ_HAVE_ICU=0 ICU_LIB= @@ -156,7 +150,7 @@ LINK=link.exe 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 +COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no DEBUG_LNK_OPTIONS= /debug -- 1.7.10.4