Fixed: Improve compilation speed including revision.h in a smaller .cpp file
This commit is contained in:
parent
ac47959ce4
commit
32ac8fc5d5
3 changed files with 154 additions and 34 deletions
|
@ -21,8 +21,6 @@
|
||||||
// Memory
|
// Memory
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "game_share/ryzom_version.h"
|
|
||||||
|
|
||||||
#include "nel/misc/i_xml.h"
|
#include "nel/misc/i_xml.h"
|
||||||
#include "nel/misc/o_xml.h"
|
#include "nel/misc/o_xml.h"
|
||||||
#include "nel/misc/algo.h"
|
#include "nel/misc/algo.h"
|
||||||
|
@ -131,29 +129,7 @@ using namespace NLGUI;
|
||||||
#include "parser_modules.h"
|
#include "parser_modules.h"
|
||||||
|
|
||||||
#include "../global.h"
|
#include "../global.h"
|
||||||
|
#include "user_agent.h"
|
||||||
#ifdef HAVE_REVISION_H
|
|
||||||
#include "revision.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HAVE_X86_64)
|
|
||||||
#define RYZOM_ARCH "x64"
|
|
||||||
#elif defined(HAVE_X86)
|
|
||||||
#define RYZOM_ARCH "x86"
|
|
||||||
#elif defined(HAVE_ARM)
|
|
||||||
#define RYZOM_ARCH "arm"
|
|
||||||
#else
|
|
||||||
#define RYZOM_ARCH "unknow"
|
|
||||||
#endif
|
|
||||||
#if defined(NL_OS_WINDOWS)
|
|
||||||
#define RYZOM_SYSTEM "windows"
|
|
||||||
#elif defined(NL_OS_MAC)
|
|
||||||
#define RYZOM_SYSTEM "mac"
|
|
||||||
#elif defined(NL_OS_UNIX)
|
|
||||||
#define RYZOM_SYSTEM "unix"
|
|
||||||
#else
|
|
||||||
#define RYZOM_SYSTEM "unkown"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
using namespace NLMISC;
|
using namespace NLMISC;
|
||||||
|
|
||||||
|
@ -489,18 +465,10 @@ CInterfaceManager::CInterfaceManager()
|
||||||
CViewTextID::setTextProvider( &SMTextProvider );
|
CViewTextID::setTextProvider( &SMTextProvider );
|
||||||
CViewTextFormated::setFormatter( &RyzomTextFormatter );
|
CViewTextFormated::setFormatter( &RyzomTextFormatter );
|
||||||
|
|
||||||
char buffer[256];
|
|
||||||
|
|
||||||
#ifdef REVISION
|
|
||||||
sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
|
|
||||||
#else
|
|
||||||
sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
|
CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
|
||||||
CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
|
CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
|
||||||
CGroupHTML::options.appName = "Ryzom";
|
CGroupHTML::options.appName = "Ryzom";
|
||||||
CGroupHTML::options.appVersion = buffer;
|
CGroupHTML::options.appVersion = getUserAgent();
|
||||||
|
|
||||||
NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
|
NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
|
||||||
interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();
|
interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();
|
||||||
|
|
65
code/ryzom/client/src/user_agent.cpp
Normal file
65
code/ryzom/client/src/user_agent.cpp
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||||
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as
|
||||||
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include "stdpch.h"
|
||||||
|
#include "user_agent.h"
|
||||||
|
|
||||||
|
#include "game_share/ryzom_version.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_REVISION_H
|
||||||
|
#include "revision.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_X86_64)
|
||||||
|
#define RYZOM_ARCH "x64"
|
||||||
|
#elif defined(HAVE_X86)
|
||||||
|
#define RYZOM_ARCH "x86"
|
||||||
|
#elif defined(HAVE_ARM)
|
||||||
|
#define RYZOM_ARCH "arm"
|
||||||
|
#else
|
||||||
|
#define RYZOM_ARCH "unknown"
|
||||||
|
#endif
|
||||||
|
#if defined(NL_OS_WINDOWS)
|
||||||
|
#define RYZOM_SYSTEM "windows"
|
||||||
|
#elif defined(NL_OS_MAC)
|
||||||
|
#define RYZOM_SYSTEM "mac"
|
||||||
|
#elif defined(NL_OS_UNIX)
|
||||||
|
#define RYZOM_SYSTEM "unix"
|
||||||
|
#else
|
||||||
|
#define RYZOM_SYSTEM "unknown"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string getUserAgent()
|
||||||
|
{
|
||||||
|
static std::string s_userAgent;
|
||||||
|
|
||||||
|
if (s_userAgent.empty())
|
||||||
|
{
|
||||||
|
char buffer[256];
|
||||||
|
|
||||||
|
#ifdef REVISION
|
||||||
|
sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
|
||||||
|
#else
|
||||||
|
sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
s_userAgent = buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
return s_userAgent;
|
||||||
|
}
|
87
code/ryzom/client/src/user_agent.h
Normal file
87
code/ryzom/client/src/user_agent.h
Normal file
|
@ -0,0 +1,87 @@
|
||||||
|
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||||
|
// Copyright (C) 2010 Winch Gate Property Limited
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as
|
||||||
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#ifndef CL_USER_AGENT_H
|
||||||
|
#define CL_USER_AGENT_H
|
||||||
|
|
||||||
|
std::string getUserAgent();
|
||||||
|
|
||||||
|
#endif // CL_USER_AGENT_H
|
||||||
|
|
||||||
|
/* End of user_agent.h */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue