Author: esr
Date: Wed Mar 26 11:41:50 2008
New Revision: 25138
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25138&view=rev
Log:
Eliminate wesconfig.h includes where they are no longer needed.
Fix a minor Windows porting bug due to a typo (WIN32 -> _WIN32).
Make game_config.o explicitly dependent on the verion stamp file in scons.
Modified:
trunk/SConstruct
trunk/src/ai.cpp
trunk/src/ai_python.cpp
trunk/src/filesystem.cpp
trunk/src/game.cpp
trunk/src/multiplayer_connect.cpp
trunk/src/titlescreen.cpp
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Wed Mar 26 11:41:50 2008
@@ -435,10 +435,11 @@
# FIXME: Include this in gameconfig.cpp when we switch over to scons.
# Because of the content check, scons will do the right thing.
-# At that point -DSVNREV can be removed from CXXFLAGS.
-#r = env.Command("revision_stamp.h", [],
-# 'echo "#define REVISION \"%s\"" >revision_stamp.h' % svnrev)
-#env.AlwaysBuild(r)
+# At that point the following line and -DSVNREV can be removed from CXXFLAGS.
+env.Depends('src/game_config.o', 'revision_stamp.h')
+r = env.Command("revision_stamp.h", [],
+ 'echo "#define REVISION \"%s\"" >revision_stamp.h' % svnrev)
+env.AlwaysBuild(r)
#
# File inventory, for archive makes abd analysis tools
Modified: trunk/src/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai.cpp?rev=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/src/ai.cpp (original)
+++ trunk/src/ai.cpp Wed Mar 26 11:41:50 2008
@@ -17,7 +17,6 @@
//! @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=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/src/ai_python.cpp (original)
+++ trunk/src/ai_python.cpp Wed Mar 26 11:41:50 2008
@@ -37,8 +37,6 @@
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/filesystem.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/filesystem.cpp?rev=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/src/filesystem.cpp (original)
+++ trunk/src/filesystem.cpp Wed Mar 26 11:41:50 2008
@@ -371,7 +371,7 @@
if(res != NULL) {
std::string str(res);
-#ifdef WIN32
+#ifdef _WIN32
std::replace(str.begin(),str.end(),'\\','/');
#endif
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Wed Mar 26 11:41:50 2008
@@ -49,7 +49,6 @@
#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"
@@ -285,6 +284,7 @@
}
}
+ std::cerr << "Data at '" << game_config::path << "'\n";
// disable sound in nosound mode, or when sound engine failed to
initialize
if (no_sound || ((preferences::sound_on() || preferences::music_on() ||
Modified: trunk/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_connect.cpp?rev=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/src/multiplayer_connect.cpp (original)
+++ trunk/src/multiplayer_connect.cpp Wed Mar 26 11:41:50 2008
@@ -29,7 +29,6 @@
#include "statistics.hpp"
#include "show_dialog.hpp"
#include "serialization/string_utils.hpp"
-#include "wesconfig.h"
#include <cassert>
Modified: trunk/src/titlescreen.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/titlescreen.cpp?rev=25138&r1=25137&r2=25138&view=diff
==============================================================================
--- trunk/src/titlescreen.cpp (original)
+++ trunk/src/titlescreen.cpp Wed Mar 26 11:41:50 2008
@@ -40,7 +40,6 @@
#include "video.hpp"
#include "serialization/parser.hpp"
#include "serialization/preprocessor.hpp"
-#include "wesconfig.h"
#include <algorithm>
#include "SDL_ttf.h"
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
