projects
/
metaproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
667e603
)
Use yaz4 DLLs
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 13 Jan 2010 21:18:37 +0000
(22:18 +0100)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 13 Jan 2010 21:18:37 +0000
(22:18 +0100)
win/makefile
patch
|
blob
|
history
diff --git
a/win/makefile
b/win/makefile
index
cacfd7f
..
cc2a235
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-14,8
+14,8
@@
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# Boost
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)"