games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Disabled git version of C::B projects

Browse Source
This commit is contained in:
AlexVinS
2016-10-27 16:27:10 +03:00
parent da1c9cf249
commit 1ccb0d98be
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/GameConstants.cpp
View File

@@ -12,6 +12,10 @@
#include "StdInc.h" #include "StdInc.h"
#ifndef VCMI_NO_EXTRA_VERSION
#include "../Version.h"
#endif
#include "VCMI_Lib.h" #include "VCMI_Lib.h"
#include "mapObjects/CObjectClassesHandler.h" #include "mapObjects/CObjectClassesHandler.h"
#include "CArtHandler.h" #include "CArtHandler.h"
@@ -31,6 +35,15 @@ const PlayerColor PlayerColor::NEUTRAL = PlayerColor(255);
const PlayerColor PlayerColor::PLAYER_LIMIT = PlayerColor(PLAYER_LIMIT_I); const PlayerColor PlayerColor::PLAYER_LIMIT = PlayerColor(PLAYER_LIMIT_I);
const TeamID TeamID::NO_TEAM = TeamID(255); const TeamID TeamID::NO_TEAM = TeamID(255);
namespace GameConstants
{
#ifdef VCMI_NO_EXTRA_VERSION
const std::string VCMI_VERSION = std::string("VCMI 0.98h");
#else
const std::string VCMI_VERSION = std::string("VCMI 0.98h ") + GIT_SHA1;
#endif
}
const CArtifact * ArtifactID::toArtifact() const const CArtifact * ArtifactID::toArtifact() const
{ {
return VLC->arth->artifacts.at(*this); return VLC->arth->artifacts.at(*this);

3
lib/GameConstants.h
View File

@@ -11,11 +11,10 @@
*/ */
#include "ConstTransitivePtr.h" #include "ConstTransitivePtr.h"
#include "Version.h"
namespace GameConstants namespace GameConstants
{ {
const std::string VCMI_VERSION = std::string("VCMI 0.98h ") + GIT_SHA1; DLL_LINKAGE extern const std::string VCMI_VERSION;
const int BFIELD_WIDTH = 17; const int BFIELD_WIDTH = 17;
const int BFIELD_HEIGHT = 11; const int BFIELD_HEIGHT = 11;

2
lib/VCMI_lib.cbp
View File

@@ -110,6 +110,7 @@
<Add option="-DBOOST_SYSTEM_NO_DEPRECATED" /> <Add option="-DBOOST_SYSTEM_NO_DEPRECATED" />
<Add option="-D_WIN32_WINNT=0x0501" /> <Add option="-D_WIN32_WINNT=0x0501" />
<Add option="-D_WIN32" /> <Add option="-D_WIN32" />
<Add option="-DVCMI_NO_EXTRA_VERSION" />
<Add directory="." /> <Add directory="." />
<Add directory="$(#sdl2.include)" /> <Add directory="$(#sdl2.include)" />
<Add directory="$(#zlib.include)" /> <Add directory="$(#zlib.include)" />
@@ -121,6 +122,7 @@
<Add directory="$(#zlib.lib)" /> <Add directory="$(#zlib.lib)" />
</Linker> </Linker>
<Unit filename="../Global.h" /> <Unit filename="../Global.h" />
<Unit filename="../Version.h" />
<Unit filename="../include/vstd/CLoggerBase.h" /> <Unit filename="../include/vstd/CLoggerBase.h" />
<Unit filename="AI_Base.h" /> <Unit filename="AI_Base.h" />
<Unit filename="BattleAction.cpp" /> <Unit filename="BattleAction.cpp" />