X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=08157684bc35980acafe2b98181be120c2f2c3d9;hb=66e414a28e37d64c456f7f3738d0f0925340c065;hp=f5270b25a1e0ef0ac92f55242350d7ac771081d2;hpb=c09664fb48b008394fa61ebaf4870c14d5fb1984;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index f5270b2..0815768 100644
--- a/win/makefile
+++ b/win/makefile
@@ -7,7 +7,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.57
+VERSION=1.4.2
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
@@ -74,11 +74,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yaz4d
-YAZPPD=yazpp5d
+YAZD=yaz5d
+YAZPPD=yazpp6d
 !else
-YAZD=yaz4
-YAZPPD=yazpp5
+YAZD=yaz5
+YAZPPD=yazpp6
 !endif
 
 # YAZ includes & libs
@@ -141,6 +141,7 @@ LIBXSLT_LIB = \
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
   /D "_CRT_SECURE_NO_DEPRECATE" \
+  /D _SCL_SECURE_NO_WARNINGS \
   $(YAZ_DEF)               \
   $(YAZPP_DEF)             \
   $(BOOST_DEF)             \
@@ -217,10 +218,11 @@ PROJECT_DLL_OBJS = \
 	$(OBJDIR)\filter_auth_simple.obj \
         $(OBJDIR)\filter_backend_test.obj \
         $(OBJDIR)\filter_bounce.obj \
-        $(OBJDIR)\filter_cql_to_rpn.obj \
+        $(OBJDIR)\filter_cql_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
 	$(OBJDIR)\filter_http_client.obj \
 	$(OBJDIR)\filter_http_file.obj \
+	$(OBJDIR)\filter_http_rewrite.obj \
 	$(OBJDIR)\filter_http_rewrite1.obj \
         $(OBJDIR)\filter_limit.obj \
         $(OBJDIR)\filter_load_balance.obj \
@@ -239,6 +241,7 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_zeerex_explain.obj \
         $(OBJDIR)\filter_zoom.obj \
 	$(OBJDIR)\gduutil.obj \
+	$(OBJDIR)\html_parser.obj \
 	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \
 	$(OBJDIR)\pipe.obj \