forked from mirrors/0ad
Allow building without lobby
Commit 6a8366b99a added additional
libraries to the report but didn't consider gloox be optional. Address
this false assumption allowing to build pyrogenesis without lobby
support.
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
@@ -869,7 +869,6 @@ function setup_all_libs ()
|
||||
"zlib",
|
||||
"boost",
|
||||
"enet",
|
||||
"gloox",
|
||||
"libcurl",
|
||||
"tinygettext",
|
||||
"icu",
|
||||
@@ -881,6 +880,9 @@ function setup_all_libs ()
|
||||
"cpp_httplib",
|
||||
}
|
||||
|
||||
if not _OPTIONS["without-lobby"] then
|
||||
table.insert(extern_libs, "gloox")
|
||||
end
|
||||
|
||||
if not _OPTIONS["without-miniupnpc"] then
|
||||
table.insert(extern_libs, "miniupnpc")
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
#include "lib/debug.h"
|
||||
#include "lib/external_libraries/curl.h"
|
||||
#include "lib/external_libraries/enet.h"
|
||||
#include "lib/external_libraries/gloox.h"
|
||||
#include "lib/external_libraries/png.h"
|
||||
#include "lib/external_libraries/libsdl.h"
|
||||
#include "lib/path.h"
|
||||
@@ -94,6 +93,10 @@
|
||||
#include <fstream>
|
||||
#endif
|
||||
|
||||
#if CONFIG2_LOBBY
|
||||
#include "lib/external_libraries/gloox.h"
|
||||
#endif
|
||||
|
||||
#if CONFIG2_NVTT
|
||||
#include "nvtt/nvtt.h"
|
||||
#endif
|
||||
@@ -208,7 +211,9 @@ void ReportLibraries(const ScriptRequest& rq, JS::HandleValue settings)
|
||||
appendLibrary(LibraryReporter{rq, "boost"}.Add("version", BOOST_VERSION).MakeReport());
|
||||
appendLibrary(LibraryReporter{rq, "enet"}.Add("version", std::to_string(ENET_VERSION)).MakeReport());
|
||||
appendLibrary(LibraryReporter{rq, "fmt"}.Add("version", FMT_VERSION).MakeReport());
|
||||
#if CONFIG2_LOBBY
|
||||
appendLibrary(LibraryReporter{rq, "gloox"}.Add("version", gloox_version()).MakeReport());
|
||||
#endif
|
||||
appendLibrary(LibraryReporter{rq, "libicu"}.Add("version", U_ICU_VERSION).MakeReport());
|
||||
appendLibrary(LibraryReporter{rq, "libcurl"}.Add("version", std::string(curl_version())).MakeReport());
|
||||
#if CONFIG2_AUDIO
|
||||
|
||||
Reference in New Issue
Block a user