projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read version from IDMETA rather than configure.ac.
[yazproxy-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
aff8420
..
b094e4e
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,4
+1,4
@@
-# Copyright (C) 1998-2008 Index Data
+# Copyright (C) 1998-2011 Index Data
# All rights reserved.
###########################################################
# All rights reserved.
###########################################################
@@
-17,11
+17,11
@@
ICONV_DIR=\iconv-1.9.2.win32
# libxslt
HAVE_LIBXSLT=1
# libxslt
HAVE_LIBXSLT=1
-LIBXSLT_DIR=\libxslt-1.1.23+.win32
+LIBXSLT_DIR=\libxslt-1.1.26.win32
# libxml2 (used by libxslt)
HAVE_LIBXML2=1
# libxml2 (used by libxslt)
HAVE_LIBXML2=1
-LIBXML2_DIR=\libxml2-2.6.32+.win32
+LIBXML2_DIR=\libxml2-2.7.6.win32
# zlib compression (used by libxml2)
ZLIB_DIR=\zlib-1.2.3.win32
# zlib compression (used by libxml2)
ZLIB_DIR=\zlib-1.2.3.win32
@@
-72,11
+72,11
@@
dll: $(YAZPROXY_DLL)
proxy: $(YAZPROXY)
!if $(DEBUG)
proxy: $(YAZPROXY)
!if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp3d
+YAZD=yaz4d
+YAZPPD=yazpp4d
!else
!else
-YAZD=yaz3
-YAZPPD=yazpp3
+YAZD=yaz4
+YAZPPD=yazpp4
!endif
# YAZ includes & libs
!endif
# YAZ includes & libs
@@
-201,11
+201,7
@@
LINK=link.exe
LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
$(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
$(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_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
DEBUG_LNK_OPTIONS= /debug