X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=38d1fe08f1586ba5d1264663057a24517f68c702;hp=c296ed07705242647ff5009eb4114a443675a947;hb=917d2c4a288a19c0da7fa98ad514288d0e045413;hpb=b8d7ac4d30477a8700bd1a68d437be3fcff05193

diff --git a/win/makefile b/win/makefile
index c296ed0..38d1fe0 100644
--- a/win/makefile
+++ b/win/makefile
@@ -18,7 +18,7 @@ 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_VER=56
 ICU_LIB = c:\icu\lib
 ICU_BIN = c:\icu\bin
 ICU_INCLUDE = c:\icu\include
@@ -43,8 +43,6 @@ default: all
 all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
  testprog iconv icu libxml2 libxslt yaz_url
 
-allj: all yaz4j
-
 NSIS="c:\program files (x86)\nsis\makensis.exe"
 HHC="c:\program files (x86)\html help workshop\hhc.exe"
 
@@ -53,27 +51,27 @@ YAZ4J_DIR="..\..\yaz4j"
 YAZPATH="$(MAKEDIR)\.."
 
 
-dist: yaz.win32.nsi yaz.nsi version.nsi distclean
-	nmake DEBUG=0 allj
-	$(NSIS) yaz.win32.nsi
+dist: yaz.nsi version.nsi distclean
+	nmake DEBUG=0 all yaz4j
+	nmake nsis
 
-dist64: yaz.win64.nsi yaz.nsi version.nsi distclean
-	nmake make64
-	$(NSIS) yaz.win64.nsi
+dist64: yaz.nsi version.nsi distclean
+	nmake make64 yaz4j
+	nmake nsis64
 
 make64:
-	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
+	nmake DEBUG=0 HAVE_ICONV=0 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_BIN=\icu\bin64 all
 
 
 distclean:
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
 
-nsis: all yaz.win32.nsi version.nsi
-	$(NSIS) yaz.win32.nsi
+nsis: version.nsi
+	$(NSIS) /DVSARCH=x86 /DVSVER=12 yaz.nsi
 
-nsis64: yaz.win64.nsi version.nsi
-	$(NSIS) yaz.win64.nsi
+nsis64: version.nsi
+	$(NSIS) /DVSARCH=x64 /DVSVER=12 yaz.nsi
 
 nsishelp:
 	$(NSIS)