X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=e2c56292f096006249bd6bb6bdafeb3fd8dda06c;hb=8bef04f359fd6485b6efb0af122f53502a6e134d;hp=abc3cd7b1a4778c790b81b493dac254a674cdbf6;hpb=22e901d7fb51b461c2954ad50a3d270bad9b7bc9;p=pazpar2-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index abc3cd7..e2c5629 100644
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 0 # Can be enabled Visual Studio 2005
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.0.7
+PACKAGE_VERSION=1.1.0
 
 # YAZ
 YAZ_DIR=..\..\yaz
@@ -12,8 +12,12 @@ 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
+ICU_DIR=c:\icu
 
 default: all
 
@@ -45,8 +49,6 @@ YAZD=yaz3
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 
-# Targets - what to make
-
 PAZPAR2_EXE=$(BINDIR)\pazpar2.exe
 
 pazpar2: $(PAZPAR2_EXE)
@@ -57,6 +59,7 @@ YAZ_DEF=/DYAZ_HAVE_XML2=2 /DYAZ_HAVE_XSLT=1 /I"$(YAZ_DIR)\include"
 yaz: $(BINDIR)\$(YAZD).dll 
 
 $(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll"
+  copy "$(YAZ_DIR)\bin\icu*.dll" $(BINDIR)
   copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # Copy libxslt and associates to our bin directory
@@ -79,6 +82,16 @@ LIBXSLT_LIB = \
 	   "$(LIBXML2_DIR)\lib\libxml2.lib" \
 	   "$(LIBXSLT_DIR)\lib\libxslt.lib"
 
+!if $(HAVE_ICU)
+ICU_DEF=/DHAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_DIR)\include"
+ICU_LIB= $(ICU_DIR)\lib\icudt.lib \
+	 $(ICU_DIR)\lib\icuin.lib \
+	 $(ICU_DIR)\lib\icuuc.lib
+!else
+ICU_DEF=/DHAVE_ICU=0
+ICU_LIB=
+!endif
+
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
   /D "_CRT_SECURE_NO_DEPRECATE" \
@@ -86,6 +99,7 @@ COMMON_C_OPTIONS=          \
   /D "PACKAGE_NAME=\"$(PACKAGE_NAME)\"" \
   /D "VERSION=\"$(PACKAGE_VERSION)\"" \
   $(YAZ_DEF)               \
+  $(ICU_DEF)               \
   $(LIBXSLT_DEF)           \
   /D "_WINDOWS"            \
   /D "WIN32"               \
@@ -124,9 +138,8 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
-           wsock32.lib  advapi32.lib \
-           $(YAZ_LIB) $(LIBXSLT_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
 
@@ -177,17 +190,6 @@ PAZPAR2_OBJS = \
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-### The RC compiler (resource files)
-RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
-
-!if $(DEBUG)
-RSOPT=/d_DEBUG
-!else
-RSOPT=/d_NDEBUG
-!endif
 
 !if $(USE_MANIFEST)
 MT=mt.exe /nologo