dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add more libraries to the report

Browse source
This commit is contained in:
Stan 2025-08-06 23:20:49 +02:00
parent 2fc12e9fe9
commit 6a8366b99a
No known key found for this signature in database
GPG key ID: 244943DFF8370D60
3 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/premake/extern_libs5.lua
View file

@ -698,16 +698,18 @@ extern_lib_defs = {
else
pkgconfig.add_includes("ogg")
pkgconfig.add_includes("vorbisfile")
pkgconfig.add_includes("vorbis")
end
end,
link_settings = function()
if os.istarget("windows") then
add_default_lib_paths("vorbis")
add_default_links({
win_names = { "vorbisfile" },
win_names = { "vorbisfile", "vorbis" },
})
else
pkgconfig.add_links("vorbisfile")
pkgconfig.add_links("vorbis")
end
end,
},

7
build/premake/premake5.lua
View file

@ -852,15 +852,22 @@ function setup_all_libs ()
"zlib",
"boost",
"enet",
"gloox",
"libcurl",
"tinygettext",
"icu",
"iconv",
"libsodium",
"libpng",
"fmt",
"freetype",
}
if not _OPTIONS["without-miniupnpc"] then
table.insert(extern_libs, "miniupnpc")
end
if not _OPTIONS["without-nvtt"] then
table.insert(extern_libs, "nvtt")
end

31
source/ps/GameSetup/HWDetect.cpp
View file

@ -21,6 +21,10 @@
#include "lib/code_annotation.h"
#include "lib/config2.h"
#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"
#include "lib/posix/posix_utsname.h"
@ -68,11 +72,15 @@
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <libxml/xmlversion.h>
#include <random>
#include <sodium.h>
#include <sstream>
#include <string>
#include <thread>
#include <unicode/uvernum.h>
#include <vector>
#include <zlib.h>
// FreeType headers might have an include order.
#include <ft2build.h>
@ -90,6 +98,14 @@
#include "nvtt/nvtt.h"
#endif
#if CONFIG2_MINIUPNPC
#include <miniupnpc/miniupnpc.h>
#endif
#if CONFIG2_AUDIO
#include <vorbis/codec.h>
#endif
namespace
{
@ -191,7 +207,22 @@ void ReportLibraries(const ScriptRequest& rq, JS::HandleValue settings)
appendLibrary(MakeFreeTypeReport(rq));
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());
appendLibrary(LibraryReporter{rq, "gloox"}.Add("version", gloox_version()).MakeReport());
appendLibrary(LibraryReporter{rq, "libicu"}.Add("version", U_ICU_VERSION).MakeReport());
appendLibrary(LibraryReporter{rq, "libcurl"}.Add("version", std::string(curl_version())).MakeReport());
#if CONFIG2_AUDIO
appendLibrary(LibraryReporter{rq, "libvorbis"}.Add("version", std::string(vorbis_version_string())).MakeReport());
#endif
appendLibrary(LibraryReporter{rq, "libpng"}.Add("version", std::string(png_get_libpng_ver(nullptr))).MakeReport());
appendLibrary(LibraryReporter{rq, "libsodium"}.Add("version", std::string(sodium_version_string())).MakeReport());
appendLibrary(LibraryReporter{rq, "libxml2"}.Add("version", LIBXML_DOTTED_VERSION).MakeReport());
#if CONFIG2_MINIUPNPC
appendLibrary(LibraryReporter{rq, "miniunpnpc"}.Add("version", MINIUPNPC_VERSION).MakeReport());
#endif
appendLibrary(LibraryReporter{rq, "zlib"}.Add("version", ZLIB_VERSION).MakeReport());
#if CONFIG2_NVTT
appendLibrary(LibraryReporter{rq, "nvtt"}
.Add("build_version", NVTT_VERSION)