From 06dbc332021867d868dd5f1a57fdd92902e73e74 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 5 Dec 2005 18:52:42 +0000 Subject: Display TMW version on Windows too --- src/main.cpp | 5 ++--- src/main.h | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index e28c843b..e745e7cd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,6 @@ #ifdef __USE_UNIX98 #include #include -#include "../config.h" #endif #include "configuration.h" @@ -380,7 +379,7 @@ void parseOptions(int argc, char *argv[], Options &options) /** Main */ int main(int argc, char *argv[]) { -#ifdef __USE_UNIX98 +#ifdef PACKAGE_VERSION std::cout << "The Mana World v" << PACKAGE_VERSION << std::endl; #endif logger = new Logger(); @@ -456,7 +455,7 @@ int main(int argc, char *argv[]) } graphics->drawImage(login_wallpaper, 0, 0); -#ifdef __USE_UNIX98 +#ifdef PACKAGE_VERSION graphics->setFont(gui->getFont()); graphics->drawText(PACKAGE_VERSION, 0, 0); #endif diff --git a/src/main.h b/src/main.h index cd3a0ff2..8ad3f343 100644 --- a/src/main.h +++ b/src/main.h @@ -29,10 +29,18 @@ class Image; class Sound; +#ifdef __USE_UNIX98 +#include "../config.h" +#else +#include "../The_Mana_World_private.h" +#define PACKAGE_VERSION PRODUCT_VERSION +#endif + #ifndef TMW_DATADIR #define TMW_DATADIR "" #endif + enum { EXIT_STATE, LOGIN_STATE, -- cgit v1.2.3-70-g09d2