# Parameters
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 0
+BARCH = 32 # 32=win32/x86 or 64=x64
# TCL
TCL=tclsh
# iconv charcter conversion utility
HAVE_ICONV=0
-ICONV_DIR = c:\iconv-1.9.2.win32
+ICONV_DIR = c:\iconv-1.9.2.win$(BARCH)
# 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
+ICU_VER=56
+ICU_BASE = c:\icu-56.1-vs2015
+!if $(BARCH) == 32
+ICU_LIB = $(ICU_BASE)\lib
+ICU_BIN = $(ICU_BASE)\bin
+!elseif $(BARCH) == 64
+ICU_LIB = $(ICU_BASE)\lib64
+ICU_BIN = $(ICU_BASE)\bin64
+!else
+!error BARCH must be 32 or 64
+!endif
+ICU_INCLUDE = $(ICU_BASE)\include
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.28.win32
+LIBXSLT_DIR=c:\libxslt-1.1.28.win$(BARCH)
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.9.2.win32
+LIBXML2_DIR=c:\libxml2-2.9.2.win$(BARCH)
# get WIN32 binaries libxml2 & iconv & zlib from here:
# http://www.zlatkovic.com/libxml.en.html
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"
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 BARCH=64 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=14 yaz.nsi
-nsis64: yaz.win64.nsi version.nsi
- $(NSIS) yaz.win64.nsi
+nsis64: version.nsi
+ $(NSIS) /DVSARCH=x64 /DVSVER=14 yaz.nsi
nsishelp:
$(NSIS)
### Linker options
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 $(MTOPT)
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
DEBUG_LNK_OPTIONS= /debug
$(YAZ_RES) \
/out:$@ \
/implib:"$(YAZ_IMPLIB)"
- $(MT) -manifest $@.manifest -outputresource:$@;2
$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
$(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
$(YAZ_ICU_RES) \
/out:$@ \
/implib:"$(YAZ_ICU_IMPLIB)"
- $(MT) -manifest $@.manifest -outputresource:$@;2
$(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
$(LINK_DLL) $(COND_LIB) $(YAZ_IMPLIB)\
$(YAZ_COND_RES) \
/out:$@ \
/implib:"$(YAZ_COND_IMPLIB)"
- $(MT) -manifest $@.manifest -outputresource:$@;2
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
$(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(ZTEST_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
-
$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_COND_DLL)
$(LINK_PROGRAM) $(YAZ_COND_IMPLIB) $(TEST_MUTEX_OBJS) /out:$@
- $(MT) -manifest $@.manifest -outputresource:$@;1
# Other rules
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
- -del $(BINDIR)\*.manifest
-del $(TMPDIR)\*.
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ