X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=b82ddf4e7710f077c39ac53dd97db2691402e285;hp=8ad37b22798b454746c9bfc384e0ea457e4b6d57;hb=dca8928db421aa8750ac9ffead1a5c09a85f4f8b;hpb=d7e028ba0de38f6060f53cf75ca7246c402eb34f

diff --git a/win/makefile b/win/makefile
index 8ad37b2..b82ddf4 100644
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 # Parameters
 
 DEBUG=0   # 0 for release, 1 for debug
-USE_MANIFEST = 1
+USE_MANIFEST = 0
 
 # TCL
 TCL=tclsh
@@ -12,26 +12,24 @@ TCL=tclsh
 HAVE_TCL=1
 
 # iconv charcter conversion utility
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR = c:\iconv-1.9.2.win32
 
 # icu charcter conversion utility
 # get icu libraries from http://www.icu-project.org
 HAVE_ICU=1
+ICU_VER=54
 ICU_LIB = c:\icu\lib
 ICU_BIN = c:\icu\bin
 ICU_INCLUDE = c:\icu\include
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.26.win32
+LIBXSLT_DIR=c:\libxslt-1.1.28.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.6.win32
-
-# zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.3.win32
+LIBXML2_DIR=c:\libxml2-2.9.2.win32
 
 # get WIN32 binaries libxml2 & iconv & zlib from here:
 #  http://www.zlatkovic.com/libxml.en.html
@@ -45,8 +43,10 @@ default: all
 all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
  testprog iconv icu libxml2 libxslt yaz_url
 
-NSIS="c:\program files\nsis\makensis.exe"
-HHC="c:\program files\html help workshop\hhc.exe"
+allj: all yaz4j
+
+NSIS="c:\program files (x86)\nsis\makensis.exe"
+HHC="c:\program files (x86)\html help workshop\hhc.exe"
 
 YAZ4J_DIR="..\..\yaz4j"
 
@@ -54,7 +54,7 @@ YAZPATH="$(MAKEDIR)\.."
 
 
 dist: yaz.win32.nsi yaz.nsi distclean
-	nmake DEBUG=0 all yaz4j
+	nmake DEBUG=0 allj
 	$(NSIS) yaz.win32.nsi
 
 dist64: yaz.win64.nsi yaz.nsi distclean
@@ -62,7 +62,7 @@ dist64: yaz.win64.nsi yaz.nsi distclean
 	$(NSIS) yaz.win64.nsi
 
 make64:
-	nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64 YAZ4J_DIR=..\..\..\yaz4j all yaz4j
+	nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_INCLUDE=\icu\include ICU_BIN=\icu\bin64 YAZ4J_DIR=..\..\..\yaz4j allj
 
 
 distclean:
@@ -192,7 +192,6 @@ iconv:
 !if $(HAVE_ICU)
 ICU_DEF= \
   /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
-ICU_VER=42
 ICU_LIBS= \
   $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
 icu: $(BINDIR)\icudt$(ICU_VER).dll \
@@ -217,15 +216,11 @@ yazicu:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
+LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include\libxml2"
+libxml2: $(BINDIR)\libxml2.dll
 
 $(BINDIR)\libxml2.dll:
   copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
-  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D YAZ_HAVE_XML2=0
@@ -242,7 +237,7 @@ LIBXSLT_DEF= \
 libxslt: $(BINDIR)\libxslt.dll
 
 $(BINDIR)\libxslt.dll:
-  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+  copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
 
 !else
 LIBXSLT_LIB=
@@ -295,14 +290,16 @@ LINK=link.exe
 
 !if $(USE_MANIFEST)
 MT=mt.exe /nologo
+MTOPT=/manifest
 !else
 MT=echo
+MTOPT=
 !endif
 
 LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
 	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no /manifest
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT)
 
 DEBUG_LNK_OPTIONS= /debug
 
@@ -1033,6 +1030,7 @@ clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
 	-del $(BINDIR)\*.pdb
+	-del $(BINDIR)\*.manifest
 	-del $(TMPDIR)\*.
 	-del $(LIBDIR)\*.LIB
 	-del $(OBJDIR)\*.OBJ