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

Add git commit hash into the version string

Browse Source
This commit is contained in:
Vadim Markovtsev
2016-10-23 15:45:47 +02:00
parent 4bcc43d3d0
commit d0beb27197
11 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AI/BattleAI/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
project(battleAI)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
set(battleAI_SRCS

4
AI/EmptyAI/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
project(emptyAI)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
set(emptyAI_SRCS

8
AI/StupidAI/CMakeLists.txt
View File

@@ -1,12 +1,16 @@
project(stupidAI)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
set(stupidAI_SRCS
StdInc.cpp
StupidAI.cpp
main.cpp
StupidAI.cpp
main.cpp
)
add_library(StupidAI SHARED ${stupidAI_SRCS})

4
AI/VCAI/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
project(VCAI)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
if (FL_FOUND)
include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${FL_INCLUDE_DIRS})
else()

1
CMakeLists.txt
View File

@@ -341,4 +341,3 @@ else()
endif()
INCLUDE(CPack)

4
client/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
project(vcmiclient)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
include_directories(${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLMIXER_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR})
include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})

4
lib/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
project(libvcmi)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/lib)
include_directories(${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})

2
lib/GameConstants.h
View File

@@ -14,7 +14,7 @@
namespace GameConstants
{
const std::string VCMI_VERSION = "VCMI 0.98h";
const std::string VCMI_VERSION = "VCMI 0.98h " GIT_SHA1;
const int BFIELD_WIDTH = 17;
const int BFIELD_HEIGHT = 11;

6
lib/VCMI_Lib.cpp
View File

@@ -63,17 +63,17 @@ void LibClasses::loadFilesystem()
CStopWatch loadTime;
CResourceHandler::initialize();
logGlobal->infoStream()<<"\t Initialization: "<<loadTime.getDiff();
logGlobal->infoStream()<<"\tInitialization: "<<loadTime.getDiff();
CResourceHandler::load("config/filesystem.json");
logGlobal->infoStream()<<"\t Data loading: "<<loadTime.getDiff();
logGlobal->infoStream()<<"\tData loading: "<<loadTime.getDiff();
modh = new CModHandler();
logGlobal->infoStream()<<"\tMod handler: "<<loadTime.getDiff();
modh->loadMods();
modh->loadModFilesystems();
logGlobal->infoStream()<<"\t Mod filesystems: "<<loadTime.getDiff();
logGlobal->infoStream()<<"\tMod filesystems: "<<loadTime.getDiff();
logGlobal->infoStream()<<"Basic initialization: "<<totalTime.getDiff();
}

4
server/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
project(vcmiserver)
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib)
include_directories(${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})

4
test/CMakeLists.txt
View File

@@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 2.6)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(-DGIT_SHA1="${GIT_SHA1}")
enable_testing()
include_directories(${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/test)
include_directories(${Boost_INCLUDE_DIRS})