X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b26d4625336a2687b013987ac2dc80790378d7d4;hb=dee29d77163776942488b38eb7691df51bb30bbc;hp=714185c8bf93d8e81afd79f8131b3effd9f29100;hpb=74d16c70e558c6b5fb0ff5b057a047d4da6d5a66;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 714185c..b26d462 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.5
 
 # 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 
 
@@ -224,7 +221,6 @@ PROJECT_DLL_OBJS = \
 	$(OBJDIR)\factory_static.obj \
         $(OBJDIR)\filter.obj \
 	$(OBJDIR)\filter_auth_simple.obj \
-	$(OBJDIR)\filter_cgi.obj \
         $(OBJDIR)\filter_backend_test.obj \
         $(OBJDIR)\filter_bounce.obj \
         $(OBJDIR)\filter_cql_to_rpn.obj \
@@ -242,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 \
@@ -252,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