mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-28 07:47:03 -05:00
sys: Fixed more build issues
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
#include <filesystem>
|
||||
|
||||
#include <wolv/io/file.hpp>
|
||||
#include <wolv/io/fs.hpp>
|
||||
|
||||
namespace hex::fs {
|
||||
|
||||
@@ -87,14 +88,7 @@ namespace hex::fs {
|
||||
|
||||
#elif defined(OS_MACOS)
|
||||
|
||||
std::fs::path applicationSupportDirPath;
|
||||
{
|
||||
auto string = getMacApplicationSupportDirectoryPath();
|
||||
applicationSupportDirPath = std::string(string);
|
||||
macFree(string);
|
||||
}
|
||||
|
||||
paths.push_back(applicationSupportDirPath);
|
||||
paths.push_back(wolv::io::fs::getApplicationSupportDirectoryPath());
|
||||
|
||||
#elif defined(OS_LINUX)
|
||||
|
||||
@@ -110,7 +104,7 @@ namespace hex::fs {
|
||||
|
||||
#if defined(OS_MACOS)
|
||||
|
||||
if (auto executablePath = fs::getExecutablePath(); executablePath.has_value())
|
||||
if (auto executablePath = wolv::io::fs::getExecutablePath(); executablePath.has_value())
|
||||
paths.push_back(*executablePath);
|
||||
|
||||
#else
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
|
||||
|
||||
void initialize() {
|
||||
if (auto executablePath = fs::getExecutablePath(); executablePath.has_value()) {
|
||||
if (auto executablePath = wolv::io::fs::getExecutablePath(); executablePath.has_value()) {
|
||||
static std::string path = executablePath->string();
|
||||
s_backtraceState = backtrace_create_state(path.c_str(), 1, [](void *, const char *msg, int) { log::error("{}", msg); }, nullptr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user