Skip to content

Commit f518c12

Browse files
committed
libloot 0.29.3 support
TODO: Merge vcpkg
1 parent 8007c74 commit f518c12

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ find_package(libloot CONFIG REQUIRED)
1414
find_package(Boost REQUIRED CONFIG COMPONENTS locale)
1515

1616
# avoid CMake error/warning
17-
set_target_properties(libloot::loot PROPERTIES
17+
set_target_properties(libloot::libloot PROPERTIES
1818
MAP_IMPORTED_CONFIG_RELEASE RelWithDebInfo
1919
MAP_IMPORTED_CONFIG_MINSIZEREL RelWithDebInfo
2020
)
@@ -42,7 +42,7 @@ target_compile_definitions(lootcli
4242
target_include_directories(lootcli PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
4343
target_precompile_headers(lootcli PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/pch.h)
4444
target_link_libraries(lootcli
45-
PRIVATE libloot::loot Boost::headers Boost::locale
45+
PRIVATE libloot::libloot Boost::headers Boost::locale
4646
tomlplusplus::tomlplusplus Qt6::Core)
4747

4848
if (MSVC)
@@ -64,7 +64,7 @@ endif()
6464

6565
install(FILES
6666
$<TARGET_FILE:lootcli>
67-
$<TARGET_FILE:libloot::loot>
67+
$<TARGET_FILE:libloot::libloot>
6868
DESTINATION bin/loot)
6969

7070
endif()

src/game_settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace loot
1414
constexpr inline std::string_view NEHRIM_STEAM_REGISTRY_KEY =
1515
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App "
1616
"1014940\\InstallLocation";
17-
static constexpr const char* DEFAULT_MASTERLIST_BRANCH = "v0.26";
17+
static constexpr const char* DEFAULT_MASTERLIST_BRANCH = "v0.29";
1818

1919
enum struct GameId : uint8_t
2020
{

src/lootthread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace lootcli
1919
{
2020
static const std::set<std::string>
2121
oldDefaultBranches({"master", "v0.7", "v0.8", "v0.10", "v0.13", "v0.14", "v0.15",
22-
"v0.17", "v0.18", "v0.21"});
22+
"v0.17", "v0.18", "v0.21", "v0.26"});
2323
static const std::regex GITHUB_REPO_URL_REGEX =
2424
std::regex(R"(^https://github\.com/([^/]+)/([^/]+?)(?:\.git)?/?$)",
2525
std::regex::ECMAScript | std::regex::icase);
@@ -867,7 +867,7 @@ LOOTWorker::createJsonReport(loot::GameInterface& game,
867867
{
868868
QJsonObject root;
869869

870-
set(root, "messages", createMessages(game.GetDatabase().GetGeneralMessages(true)));
870+
set(root, "messages", createMessages(game.GetDatabase().GetGeneralMessages(true, true)));
871871
set(root, "plugins", createPlugins(game, sortedPlugins));
872872

873873
const auto end = std::chrono::high_resolution_clock::now();

src/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#define LOOTCLI_VERSION_MAJOR 1
2-
#define LOOTCLI_VERSION_MINOR 7
2+
#define LOOTCLI_VERSION_MINOR 8
33
#define LOOTCLI_VERSION_MAINTENANCE 0
4-
#define LOOTCLI_VERSION_STRING "1.7.0"
4+
#define LOOTCLI_VERSION_STRING "1.8.0"

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
"kind": "git",
2424
"repository": "https://github.com/Silarn/vcpkg-registry",
25-
"baseline": "8beb2e0efa9c17dd6d17bb05288dd1e40727f673",
25+
"baseline": "e65087f8c544bd3bb5b4a72967b8956ce197b718",
2626
"packages": ["libloot"]
2727
}
2828
]

0 commit comments

Comments
 (0)