From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 19 May 2010 14:11:19 +0000 (+0200)
Subject: Omit CGI filter on Windows
X-Git-Tag: v1.1.5~7
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=05453ec8314180f861bbc649c0cb8a451a1af971;p=metaproxy-moved-to-github.git

Omit CGI filter on Windows
---

diff --git a/src/factory_static.cpp b/src/factory_static.cpp
index 59709e5..51cb3fc 100644
--- a/src/factory_static.cpp
+++ b/src/factory_static.cpp
@@ -30,7 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "filter_auth_simple.hpp"
 #include "filter_backend_test.hpp"
 #include "filter_bounce.hpp"
+#ifndef WIN32
 #include "filter_cgi.hpp"
+#endif
 #include "filter_cql_to_rpn.hpp"
 #include "filter_frontend_net.hpp"
 #include "filter_http_file.hpp"
@@ -55,7 +57,9 @@ mp::FactoryStatic::FactoryStatic()
         &metaproxy_1_filter_auth_simple,
         &metaproxy_1_filter_backend_test,
         &metaproxy_1_filter_bounce,
+#ifndef WIN32
         &metaproxy_1_filter_cgi,
+#endif
         &metaproxy_1_filter_cql_to_rpn,
         &metaproxy_1_filter_frontend_net,        
         &metaproxy_1_filter_http_file,
diff --git a/win/makefile b/win/makefile
index 8dd29d0..f64d6eb 100644
--- a/win/makefile
+++ b/win/makefile
@@ -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 
 
@@ -226,7 +223,6 @@ PROJECT_DLL_OBJS = \
 	$(OBJDIR)\filter_auth_simple.obj \
         $(OBJDIR)\filter_backend_test.obj \
         $(OBJDIR)\filter_bounce.obj \
-	$(OBJDIR)\filter_cgi.obj \
         $(OBJDIR)\filter_cql_to_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
 	$(OBJDIR)\filter_http_file.obj \