Author: esr
Date: Mon Mar 24 14:43:45 2008
New Revision: 25064
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25064&view=rev
Log:
Re-introduce wesconfig.h include to some files where it will be handy
for the scons build.
Modified:
trunk/SConstruct
trunk/src/ai.cpp
trunk/src/ai_python.cpp
trunk/src/game.cpp
trunk/src/multiplayer_connect.cpp
trunk/src/wesconfig.h
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25064&r1=25063&r2=25064&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Mon Mar 24 14:43:45 2008
@@ -71,8 +71,8 @@
wesnoth wesnoth_editor wesnothd campaignd exploder cutter
all = all installables
- test = unit test binary
- tags = build tags for Emacs.
+ test = unit test binary (not an imstallable)
+ TAGS = build tags for Emacs.
""" + opts.GenerateHelpText(env))
conf = Configure(env)
@@ -86,6 +86,10 @@
#
# Check some preconditions
#
+
+if float(sys.version[:3]) < 2.5:
+ print "Python version is too old, 2.4 or greater is required,"
+ Exit(1)
targets = map(str, BUILD_TARGETS)
Modified: trunk/src/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai.cpp?rev=25064&r1=25063&r2=25064&view=diff
==============================================================================
--- trunk/src/ai.cpp (original)
+++ trunk/src/ai.cpp Mon Mar 24 14:43:45 2008
@@ -17,6 +17,7 @@
//! @file ai.cpp
//! Artificial intelligence - The computer commands the enemy.
+#include "wesconfig.h"
#include "ai.hpp"
#include "ai2.hpp"
#include "ai_dfool.hpp"
Modified: trunk/src/ai_python.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_python.cpp?rev=25064&r1=25063&r2=25064&view=diff
==============================================================================
--- trunk/src/ai_python.cpp (original)
+++ trunk/src/ai_python.cpp Mon Mar 24 14:43:45 2008
@@ -37,6 +37,8 @@
the wrong number of parameters is passed to a function) - but those are not
supposed to be catched by user scripts.
*/
+
+#include "wesconfig.h"
#ifdef HAVE_PYTHON
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=25064&r1=25063&r2=25064&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Mon Mar 24 14:43:45 2008
@@ -49,6 +49,7 @@
#include "titlescreen.hpp"
#include "util.hpp"
#include "upload_log.hpp"
+#include "wesconfig.h"
#include "wml_exception.hpp"
#include "wml_separators.hpp"
#include "serialization/binary_or_text.hpp"
Modified: trunk/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_connect.cpp?rev=25064&r1=25063&r2=25064&view=diff
==============================================================================
--- trunk/src/multiplayer_connect.cpp (original)
+++ trunk/src/multiplayer_connect.cpp Mon Mar 24 14:43:45 2008
@@ -29,6 +29,7 @@
#include "statistics.hpp"
#include "show_dialog.hpp"
#include "serialization/string_utils.hpp"
+#include "wesconfig.h"
#include <cassert>
Modified: trunk/src/wesconfig.h
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/wesconfig.h?rev=25064&r1=25063&r2=25064&view=diff
==============================================================================
--- trunk/src/wesconfig.h (original)
+++ trunk/src/wesconfig.h Mon Mar 24 14:43:45 2008
@@ -8,23 +8,20 @@
//! DO NOT MODIFY THIS FILE !!!
//! modify SConstruct otherwise the settings will be overwritten.
+// We are building with scons, so Python cannot be absent.
+#define HAVE_PYTHON
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#else
# define VERSION "1.5.0-svn"
# define PACKAGE "wesnoth"
# ifndef LOCALEDIR
# define LOCALEDIR "translations"
# endif
-#endif
/**
* Some older savegames of Wesnoth cannot be loaded anymore,
* this variable defines the minimum required version.
* It is only to be updated upon changes that break *all* saves/replays
- * (break as in crash wesnoth, not compatibility issues like stat changes)
+ * (break as in crash Wesnoth, not compatibility issues like stat changes)
*/
#define MIN_SAVEGAME_VERSION "1.3.10"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
