flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce build config template buildconfig.h.in

Browse Source 
refs #625
This commit is contained in:
Roland Winklmeier
2016-03-31 17:12:01 +02:00
parent 4e9c34b04a
commit d379f14133
45 changed files with 279 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/data/globalsetup.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "globalsetup.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/math/mathutils.h"
#include "blackmisc/stringutils.h"
#include <QStringList>
@@ -29,7 +29,7 @@ namespace BlackCore
m_vatsimMetarsUrls( {"http://metar.vatsim.net/metar.php"}),
m_vatsimStatusFileUrls({ "https://status.vatsim.net" }),
m_vatsimDataFileUrls({ "http://info.vroute.net/vatsim-data.txt" }),
m_sharedUrls(CProject::swiftTeamDefaultServers()),
m_sharedUrls(CBuildConfig::swiftTeamDefaultServers()),
m_newsUrls(QStringList({ "http://swift-project.org/" }))
{ }

10
src/blackcore/data/updateinfo.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "updateinfo.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include <QStringList>
using namespace BlackMisc;
@@ -22,20 +22,20 @@ namespace BlackCore
ITimestampBased(0),
m_downloadsStableUrls(QStringList {"http://swift-project.org/"}),
m_downloadsBetaUrls(QStringList {"http://swift-project.org/"}),
m_latestVersionStable(CProject::version()),
m_latestVersionStable(CVersion::version()),
m_lastSupportedVersionStable("0.6"),
m_latestVersionBeta(CProject::version()),
m_latestVersionBeta(CVersion::version()),
m_lastSupportedVersionBeta("0.6")
{ }
CUrlList CUpdateInfo::getDownloadUrls() const
{
return CProject::isBetaTest() ? getDownloadUrlsBeta() : getDownloadUrlsStable();
return CBuildConfig::isBetaTest() ? getDownloadUrlsBeta() : getDownloadUrlsStable();
}
QString CUpdateInfo::getLatestVersion() const
{
return CProject::isBetaTest() ? getLatestVersionBeta() : getLatestVersionStable();
return CBuildConfig::isBetaTest() ? getLatestVersionBeta() : getLatestVersionStable();
}
bool CUpdateInfo::hasSameType(const CUpdateInfo &otherDownload) const