edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

CMake option to disable autoupdater. Closes #1292

Browse source
This commit is contained in:
Learath 2018-09-20 03:01:31 +02:00
parent c7941db9d4
commit 3852f0e720
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -74,6 +74,7 @@ endif()
option(WEBSOCKETS "Enable websockets support" OFF)
option(MYSQL "Enable mysql support" OFF)
option(AUTOUPDATE "Enable the autoupdater" ON)
option(CLIENT "Compile client" ON)
option(DOWNLOAD_GTEST "Download and compile GTest" ${AUTO_DEPENDENCIES_DEFAULT})
option(PREFER_BUNDLED_LIBS "Prefer bundled libraries over system libraries" ${AUTO_DEPENDENCIES_DEFAULT})
@ -1538,6 +1539,9 @@ foreach(target ${TARGETS_OWN})
target_compile_definitions(${target} PRIVATE CONF_SQL)
target_include_directories(${target} PRIVATE ${MYSQL_INCLUDE_DIRS})
endif()
if(AUTOUPDATE)
target_compile_definitions(${target} PRIVATE CONF_AUTOUPDATE)
endif()
endforeach()
foreach(target ${TARGETS_DEP})

8
src/engine/client/client.cpp
View file

@ -2617,7 +2617,7 @@ void CClient::RegisterInterfaces()
Kernel()->RegisterInterface(static_cast<IGhostRecorder*>(&m_GhostRecorder), false);
Kernel()->RegisterInterface(static_cast<IGhostLoader*>(&m_GhostLoader), false);
Kernel()->RegisterInterface(static_cast<IServerBrowser*>(&m_ServerBrowser), false);
#if !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
#if defined(CONF_AUTOUPDATE) && !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
Kernel()->RegisterInterface(static_cast<IUpdater*>(&m_Updater), false);
#endif
Kernel()->RegisterInterface(static_cast<IFriends*>(&m_Friends), false);
@ -2635,7 +2635,7 @@ void CClient::InitInterfaces()
m_pInput = Kernel()->RequestInterface<IEngineInput>();
m_pMap = Kernel()->RequestInterface<IEngineMap>();
m_pMasterServer = Kernel()->RequestInterface<IEngineMasterServer>();
#if !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
#if defined(CONF_AUTOUPDATE) && !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
m_pUpdater = Kernel()->RequestInterface<IUpdater>();
#endif
m_pStorage = Kernel()->RequestInterface<IStorage>();
@ -2646,7 +2646,7 @@ void CClient::InitInterfaces()
HttpInit(m_pStorage);
#if !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
#if defined(CONF_AUTOUPDATE) && !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
m_Updater.Init();
#endif
@ -2832,7 +2832,7 @@ void CClient::Run()
// update input
if(Input()->Update())
break; // SDL_QUIT
#if !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
#if defined(CONF_AUTOUPDATE) && !defined(CONF_PLATFORM_MACOSX) && !defined(__ANDROID__)
Updater()->Update();
#endif