Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Updated conan dependencies #3037

Merged
merged 4 commits into from
Oct 15, 2023
Merged

⬆️ Updated conan dependencies #3037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7dac6e
:arrow_up: Update dependency fmt to v10
AnotherFoxGuy Sep 28, 2023
b0dcd7e
:arrow_up: Update dependency openssl to v3
renovate-bot Sep 16, 2023
36eaeb2
:arrow_up: Update dependency libcurl to v8
AnotherFoxGuy Sep 16, 2023
1059a5d
:arrow_up: Update dependency libwebp to 1.3.2
AnotherFoxGuy Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ class RoR(ConanFile):
def requirements(self):
self.requires("angelscript/2.35.1")
self.requires("discord-rpc/3.4.0@anotherfoxguy/stable")
self.requires("fmt/8.0.1")
self.requires("libcurl/7.79.1")
self.requires("libcurl/8.2.1")
self.requires("fmt/10.1.1")
self.requires("mygui/3.4.0@anotherfoxguy/stable")
self.requires("ogre3d-caelum/0.6.3.1@anotherfoxguy/stable")
self.requires("ogre3d-pagedgeometry/1.2.0@anotherfoxguy/stable")
self.requires("ogre3d/1.11.6.1@anotherfoxguy/stable", force=True)
self.requires("ois/1.4.1@rigsofrods/custom")
self.requires("openal-soft/1.22.2")
self.requires("openssl/1.1.1s", force=True)
self.requires("openssl/3.1.2", force=True)
self.requires("rapidjson/cci.20211112", force=True)
self.requires("socketw/3.11.0@anotherfoxguy/stable")

self.requires("libpng/1.6.39", override=True)
self.requires("libwebp/1.3.0", override=True)
self.requires("libwebp/1.3.2", override=True)
self.requires("zlib/1.2.13", override=True)

def generate(self):
Expand Down
4 changes: 2 additions & 2 deletions source/main/scripting/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,12 @@ int ScriptEngine::executeContextAndHandleErrors(ScriptUnitId_t nid)
if (context->GetFunction())
{
SLOG(fmt::format("The script ended with error code asCONTEXT_NOT_PREPARED; Function to execute: {},currently triggered event: {}, NID: {}",
context->GetFunction()->GetName(), m_currently_executing_event_trigger, nid));
context->GetFunction()->GetName(), fmt::underlying(m_currently_executing_event_trigger), nid));
}
else
{
SLOG(fmt::format("The script ended with error code asCONTEXT_NOT_PREPARED; Function to execute NOT SET,currently triggered event: {}, NID: {}",
m_currently_executing_event_trigger, nid));
fmt::underlying(m_currently_executing_event_trigger), nid));
}
}
else
Expand Down