linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2332
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-12-05 22:56:45 +0100
message:
  mingw build fix
modified:
  boost/boost/regex/config.hpp
  win32/SConscript


--
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 'boost/boost/regex/config.hpp'
--- boost/boost/regex/config.hpp	2010-12-03 16:34:54 +0000
+++ boost/boost/regex/config.hpp	2010-12-05 21:56:45 +0000
@@ -142,11 +142,6 @@
 #  define BOOST_REGEX_NO_LIB
 #endif
 
-#if defined(__GNUC__) && (defined(_WIN32) || defined(__CYGWIN__))
-/* gcc on win32 has problems if you include <windows.h>
-   (sporadically generates bad code). */
-#  define BOOST_REGEX_NO_W32
-#endif
 #if defined(__COMO__) && !defined(BOOST_REGEX_NO_W32) && !defined(_MSC_EXTENSIONS)
 #  define BOOST_REGEX_NO_W32
 #endif

=== modified file 'win32/SConscript'
--- win32/SConscript	2010-12-05 17:03:00 +0000
+++ win32/SConscript	2010-12-05 21:56:45 +0000
@@ -43,5 +43,5 @@
 headers=dev.get_sources(source_path, "*.h")
 dev.i18n(source_path, env, [sources,headers], 'dcpp-win32')
 
-ret = env.Program(target, [sources, res, dev.boost, dev.client, dev.zlib, dev.bzip2, dev.miniupnpc, dev.dwt, dev.intl])
+ret = env.Program(target, [sources, res, dev.client, dev.zlib, dev.boost, dev.bzip2, dev.miniupnpc, dev.dwt, dev.intl])
 Return('ret')