Author: esr
Date: Thu Apr 19 07:16:12 2007
New Revision: 16932
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16932&view=rev
Log:
Properly conditionalize the SVNVER code when the #define is not available.
Modified:
trunk/src/editor/editor_main.cpp
trunk/src/game_config.hpp
trunk/src/titlescreen.cpp
Modified: trunk/src/editor/editor_main.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor_main.cpp?rev=16932&r1=16931&r2=16932&view=diff
==============================================================================
--- trunk/src/editor/editor_main.cpp (original)
+++ trunk/src/editor/editor_main.cpp Thu Apr 19 07:16:12 2007
@@ -67,7 +67,9 @@
} else if(val == "--version" || val == "-v") {
std::cout << "Battle for Wesnoth "
<< game_config::version
+#ifdef SVNREV
<< " (" << game_config::svnrev << ")"
+#endif /* SVNREV */
<< "\n";
return 0;
} else if(val == "--path") {
Modified: trunk/src/game_config.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_config.hpp?rev=16932&r1=16931&r2=16932&view=diff
==============================================================================
--- trunk/src/game_config.hpp (original)
+++ trunk/src/game_config.hpp Thu Apr 19 07:16:12 2007
@@ -32,7 +32,9 @@
extern int kill_experience;
extern int lobby_refresh;
extern const std::string version;
+#ifdef SVNREV
extern const std::string svnrev;
+#endif /* SVNREV */
extern bool debug, editor, ignore_replay_errors, mp_debug, exit_at_end,
no_delay, disable_autosave;
Modified: trunk/src/titlescreen.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/titlescreen.cpp?rev=16932&r1=16931&r2=16932&view=diff
==============================================================================
--- trunk/src/titlescreen.cpp (original)
+++ trunk/src/titlescreen.cpp Thu Apr 19 07:16:12 2007
@@ -231,8 +231,11 @@
LOG_DP << "faded logo\n";
const std::string& version_str = _("Version") + std::string(" ") +
- game_config::version +
- " (" + game_config::svnrev + ")";
+ game_config::version
+#ifdef SVNREV
+ + " (" + game_config::svnrev + ")"
+#endif /* SVNREV */
+ ;
const SDL_Rect version_area = font::draw_text(NULL,screen_area(),
font::SIZE_TINY,
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
