X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=b173e8342f3918494e54a9680de0252925a6be02;hb=483506d77575e56ec3915d55e3dfcdd7bde37e0f;hp=684340d334936eca5ab6b35668db6c12f52f1517;hpb=6edc3513149e8818d61d72db9d565fc3703c837b;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 684340d..b173e83 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010, Index Data
+# Copyright (C) 2005-2011 Index Data
 # All rights reserved.
 
 # MS NMAKE makefile for metaproxy
@@ -7,7 +7,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.1.1
+VERSION=1.2.6
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
@@ -191,10 +191,7 @@ LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
           $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB) \
 	  $(BOOST_LIB) 
 
-COMMON_LNK_OPTIONS= /nologo \
-                  /subsystem:windows \
-                  /machine:i386 \
-		  /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -241,6 +238,7 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_virt_db.obj \
         $(OBJDIR)\filter_z3950_client.obj \
         $(OBJDIR)\filter_zeerex_explain.obj \
+        $(OBJDIR)\filter_zoom.obj \
 	$(OBJDIR)\gduutil.obj \
 	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \
@@ -251,6 +249,7 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\session.obj \
         $(OBJDIR)\sru_util.obj \
 	$(OBJDIR)\thread_pool_observer.obj \
+        $(OBJDIR)\torus.obj \
         $(OBJDIR)\util.obj \
         $(OBJDIR)\xmlutil.obj