projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.4.4
[metaproxy-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
1f8e011
..
6a6ff95
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,6
@@
-# Copyright (C) 2005-2013 Index Data
-# All rights reserved.
+# This file is part of metaproxy
+# Copyright (C) Index Data
+# See the file LICENSE for details.
# MS NMAKE makefile for metaproxy
# MS NMAKE makefile for metaproxy
@@
-7,15
+8,16
@@
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
-VERSION=1.3.62
+VERSION=1.4.2
# YAZ and YAZ++ directories
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# Boost
# YAZ and YAZ++ directories
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# Boost
-BOOST=\program files\boost\boost_1_51
-BOOST_VERSION=1_51
+BOOST=\local\boost_1_55_0
+BOOST_VERSION=1_55
+BOOST_LIBPATH=$(BOOST)\lib32-msvc-9.0
BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003
BOOST_MODEL=mt
BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003
BOOST_MODEL=mt
@@
-74,11
+76,11
@@
test_pipe: $(TEST_PIPE)
###########################################################
!if $(DEBUG)
###########################################################
!if $(DEBUG)
-YAZD=yaz4d
-YAZPPD=yazpp5d
+YAZD=yaz5d
+YAZPPD=yazpp6d
!else
!else
-YAZD=yaz4
-YAZPPD=yazpp5
+YAZD=yaz5
+YAZPPD=yazpp6
!endif
# YAZ includes & libs
!endif
# YAZ includes & libs
@@
-123,7
+125,7
@@
BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
BOOST_DEF = /I"$(BOOST)"
BOOST_LIB = \
BOOST_DEF = /I"$(BOOST)"
BOOST_LIB = \
- /LIBPATH:"$(BOOST)\lib" \
+ /LIBPATH:"$(BOOST_LIBPATH)" \
"libboost_thread-$(BOOST_LIB_SUFFIX)" \
"libboost_regex-$(BOOST_LIB_SUFFIX)" \
"libboost_date_time-$(BOOST_LIB_SUFFIX)"
"libboost_thread-$(BOOST_LIB_SUFFIX)" \
"libboost_regex-$(BOOST_LIB_SUFFIX)" \
"libboost_date_time-$(BOOST_LIB_SUFFIX)"
@@
-141,6
+143,7
@@
LIBXSLT_LIB = \
COMMON_C_OPTIONS= \
/nologo /W3 /EHsc /FD /c \
/D "_CRT_SECURE_NO_DEPRECATE" \
COMMON_C_OPTIONS= \
/nologo /W3 /EHsc /FD /c \
/D "_CRT_SECURE_NO_DEPRECATE" \
+ /D _SCL_SECURE_NO_WARNINGS \
$(YAZ_DEF) \
$(YAZPP_DEF) \
$(BOOST_DEF) \
$(YAZ_DEF) \
$(YAZPP_DEF) \
$(BOOST_DEF) \
@@
-217,7
+220,7
@@
PROJECT_DLL_OBJS = \
$(OBJDIR)\filter_auth_simple.obj \
$(OBJDIR)\filter_backend_test.obj \
$(OBJDIR)\filter_bounce.obj \
$(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_frontend_net.obj \
$(OBJDIR)\filter_http_client.obj \
$(OBJDIR)\filter_http_file.obj \