From 1c270cde1ffabb965537b0ef45af44454defd2e9 Mon Sep 17 00:00:00 2001 From: auria Date: Wed, 30 Mar 2011 23:31:29 +0000 Subject: [PATCH] Add VERSION to constants.hpp, please remove that define from Visual Studio file and autotools git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8131 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/ide/Xcode/Config.xcconfig | 2 +- src/main.cpp | 1 + src/race/highscore_manager.cpp | 1 + src/race/history.cpp | 1 + src/utils/constants.cpp | 2 ++ src/utils/constants.hpp | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ide/Xcode/Config.xcconfig b/src/ide/Xcode/Config.xcconfig index 9e9e72cb8..604b64130 100644 --- a/src/ide/Xcode/Config.xcconfig +++ b/src/ide/Xcode/Config.xcconfig @@ -2,7 +2,7 @@ HEADER_SEARCH_PATHS = /usr/local/include /usr/include /Library/Frameworks/IrrFramework.framework/Versions/A/Headers/ "$(PROJECT_DIR)/../../" "$(PROJECT_DIR)/../../bullet/src" "$(PROJECT_DIR)/../../enet/include" /Library/Frameworks/fribidi.framework/Headers -OTHER_CFLAGS = -Wall -DHAVE_OGGVORBIS=1 -DHAS_SOCKLEN_T -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAS_POLL=1 -DHAS_FCNTL=1 -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_MSGHDR_FLAGS=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_GLUT=1 -DHAVE_IRRLICHT=1 -DPACKAGE="\"supertuxkart\"" -D__MACOSX__=1 -DHAVE_RTT=0 -DENABLE_BIDI=1 -fvisibility=hidden -DVERSION=\"svn\" +OTHER_CFLAGS = -Wall -DHAVE_OGGVORBIS=1 -DHAS_SOCKLEN_T -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAS_POLL=1 -DHAS_FCNTL=1 -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_MSGHDR_FLAGS=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_GLUT=1 -DHAVE_IRRLICHT=1 -DPACKAGE="\"supertuxkart\"" -D__MACOSX__=1 -DHAVE_RTT=0 -DENABLE_BIDI=1 -fvisibility=hidden OTHER_LDFLAGS = LIBRARY_SEARCH_PATHS = /usr/local/lib /usr/lib diff --git a/src/main.cpp b/src/main.cpp index d79f82104..df7bd3c16 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -73,6 +73,7 @@ #include "tracks/track.hpp" #include "tracks/track_manager.hpp" #include "tutorial/tutorial_manager.hpp" +#include "utils/constants.hpp" #include "utils/translation.hpp" // ============================================================================ diff --git a/src/race/highscore_manager.cpp b/src/race/highscore_manager.cpp index 477d61b25..3936ae418 100644 --- a/src/race/highscore_manager.cpp +++ b/src/race/highscore_manager.cpp @@ -26,6 +26,7 @@ #include "io/file_manager.hpp" #include "io/xml_writer.hpp" #include "race/race_manager.hpp" +#include "utils/constants.hpp" #include "utils/string_utils.hpp" #include "utils/translation.hpp" diff --git a/src/race/history.cpp b/src/race/history.cpp index 115cc9e82..64624f036 100644 --- a/src/race/history.cpp +++ b/src/race/history.cpp @@ -26,6 +26,7 @@ #include "karts/kart.hpp" #include "race/race_manager.hpp" #include "tracks/track.hpp" +#include "utils/constants.hpp" History* history = 0; diff --git a/src/utils/constants.cpp b/src/utils/constants.cpp index 09ca423db..6b248dca2 100644 --- a/src/utils/constants.cpp +++ b/src/utils/constants.cpp @@ -25,3 +25,5 @@ static const char* endianness_test_ptr = (const char*)&endianness_test; // in little-endian, byte 0 will be 0. in big endian, byte 0 will be 1 bool IS_LITTLE_ENDIAN = (endianness_test_ptr[0] == 0); + +const char* VERSION = "svn"; diff --git a/src/utils/constants.hpp b/src/utils/constants.hpp index 0b8eff842..587cc2e4a 100644 --- a/src/utils/constants.hpp +++ b/src/utils/constants.hpp @@ -53,4 +53,6 @@ extern bool IS_LITTLE_ENDIAN; #define DEFAULT_GROUP_NAME "standard" +extern char* VERSION; + #endif