AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Renamed version.h to version.hpp

Browse source 
Note for VS2008: manually create version/version.hpp to avoid build errors
This commit is contained in:
Alex Zolotarev 2010-12-06 18:22:36 +00:00 • committed by Alex Zolotarev
parent 989613fd3c
commit 8745f6a358
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -50,7 +50,7 @@ data/le9q663011
data/settings.ini
data/maps.update
GeneratedFiles
version/version.h
version/version.hpp
syntax: regexp
(.*/)?\#[^/]*\#$

12
indexer/indexer_tool/indexer_tool.cpp
View file

@ -22,7 +22,7 @@
#include "../../std/iomanip.hpp"
#include "../../std/numeric.hpp"
//#include "../../version/version.h"
#include "../../version/version.hpp"
#include "../../base/start_mem_debug.hpp"
@ -70,11 +70,11 @@ int main(int argc, char ** argv)
string const path =
FLAGS_data_path.empty() ? GetPlatform().WorkingDir() : AddSlashIfNeeded(FLAGS_data_path);
//if (FLAGS_version)
//{
// cout << "Tool version: " << VERSION_STRING << endl;
// cout << "Built on: " << VERSION_DATE_STRING << endl;
//}
if (FLAGS_version)
{
cout << "Tool version: " << VERSION_STRING << endl;
cout << "Built on: " << VERSION_DATE_STRING << endl;
}
// Make a classificator
if (FLAGS_generate_classif)

6
qt/main.cpp
View file

@ -4,7 +4,7 @@
#include "../base/logging.hpp"
//#include "../version/version.h"
#include "../version/version.hpp"
#include <QtGui/QApplication>
@ -56,8 +56,8 @@ int main(int argc, char *argv[])
InitializeFinalize mainGuard;
LOG(LINFO, ("MapsWithMe started"));
//LOG(LINFO, ("Version : ", VERSION_STRING));
//LOG(LINFO, ("Built on : ", VERSION_DATE_STRING));
LOG(LINFO, ("Version : ", VERSION_STRING));
LOG(LINFO, ("Built on : ", VERSION_DATE_STRING));
QApplication a(argc, argv);

2
version/empty_stub.cpp
View file

@ -1 +1 @@
#include "version.h"
#include "version.hpp"

2
version/version.pro
View file

@ -9,7 +9,7 @@ ROOT_DIR = ..
include($$ROOT_DIR/common.pri)
# Generate version header
VERSION_HEADER = $${IN_PWD}/../version/version.h
VERSION_HEADER = $${IN_PWD}/../version/version.hpp
versiontarget.target = $$VERSION_HEADER
win32 {