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
Add IDMETA
[metaproxy-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
cacfd7f
..
8dd29d0
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-7,15
+7,15
@@
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
-VERSION=1.0.23
+VERSION=1.1.3
# 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_35_0
-BOOST_VERSION=1_35
+BOOST=\program files\boost\boost_1_40
+BOOST_VERSION=1_40
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
@@
-76,11
+76,11
@@
test_pipe: $(TEST_PIPE)
###########################################################
!if $(DEBUG)
###########################################################
!if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp3d
+YAZD=yaz4d
+YAZPPD=yazpp4d
!else
!else
-YAZD=yaz3
-YAZPPD=yazpp3
+YAZD=yaz4
+YAZPPD=yazpp4
!endif
# YAZ includes & libs
!endif
# YAZ includes & libs
@@
-127,6
+127,7
@@
BOOST_DEF = /I"$(BOOST)"
BOOST_LIB = \
"$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
"$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)"
BOOST_LIB = \
"$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
"$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)"
+
#"$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
# "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
#"$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
# "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
@@
-225,6
+226,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_cgi.obj \
$(OBJDIR)\filter_cql_to_rpn.obj \
$(OBJDIR)\filter_frontend_net.obj \
$(OBJDIR)\filter_http_file.obj \
$(OBJDIR)\filter_cql_to_rpn.obj \
$(OBJDIR)\filter_frontend_net.obj \
$(OBJDIR)\filter_http_file.obj \