Author: suokko
Date: Fri Sep 12 14:32:57 2008
New Revision: 29418
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29418&view=rev
Log:
Fixed linking with 1.33
Modified:
trunk/src/SConscript
trunk/src/tests/main.cpp
Modified: trunk/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=29418&r1=29417&r2=29418&view=diff
==============================================================================
--- trunk/src/SConscript (original)
+++ trunk/src/SConscript Fri Sep 12 14:32:57 2008
@@ -7,6 +7,7 @@
Import("*")
env.Append(CPPDEFINES = "$EXTRA_DEFINE")
+test_env.Append(CPPDEFINES = "$EXTRA_DEFINE")
#color_range.cpp should be removed, but game_config depends on it.
#game_config has very few things that are needed elsewhere, it should be
Modified: trunk/src/tests/main.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tests/main.cpp?rev=29418&r1=29417&r2=29418&view=diff
==============================================================================
--- trunk/src/tests/main.cpp (original)
+++ trunk/src/tests/main.cpp Fri Sep 12 14:32:57 2008
@@ -14,7 +14,11 @@
#include <boost/version.hpp>
#define BOOST_TEST_MODULE wesnoth unit tests master suite
+#if BOOST_VERSION < 103400
+#include <boost/test/auto_unit_test.hpp>
+#else
#include <boost/test/unit_test.hpp>
+#endif
#include <boost/test/unit_test_monitor.hpp>
#include <boost/test/detail/unit_test_parameters.hpp>
#include <boost/test/results_reporter.hpp>
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
