------------------------------------------------------------
revno: 2216
committer: poy <[email protected]>
branch nick: repo
timestamp: Sun 2010-08-29 14:16:42 +0200
message:
boost linking fix
modified:
SConstruct
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'SConstruct'
--- SConstruct 2010-08-26 05:46:32 +0000
+++ SConstruct 2010-08-29 12:16:42 +0000
@@ -52,13 +52,13 @@
}
msvc_defs = {
- 'common' : ['_REENTRANT', 'BOOST_USE_WINDOWS_H'],
+ 'common' : ['_REENTRANT'],
'debug' : ['_DEBUG', '_HAS_ITERATOR_DEBUGGING=0', '_SECURE_SCL=0'],
'release' : ['NDEBUG']
}
gcc_defs = {
- 'common' : ['_REENTRANT', 'BOOST_USE_WINDOWS_H'],
+ 'common' : ['_REENTRANT'],
'debug' : ['_DEBUG'],
'release' : ['NDEBUG']
}
@@ -123,6 +123,10 @@
env.Append(CPPPATH = ['#/boost/', '#/intl/'])
+# boost defines
+if dev.is_win32():
+ env.Append(CPPDEFINES = ['BOOST_ALL_NO_LIB', 'BOOST_USE_WINDOWS_H'])
+
if not env['nativestl']:
env.Append(CPPPATH = ['#/stlport/stlport/'])
env.Append(LIBPATH = ['#/stlport/lib/'])
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
