add platform::get_executable_path (#638)
This commit is contained in:
parent
ecd95967c4
commit
b14bad5d24
@ -6,6 +6,7 @@
|
||||
#include <stack>
|
||||
#include "typedefs.hpp"
|
||||
#include "util/stringutil.hpp"
|
||||
#include "util/platform.hpp"
|
||||
#include <utility>
|
||||
|
||||
#include "io/devices/StdfsDevice.hpp"
|
||||
@ -44,6 +45,7 @@ void EnginePaths::prepare() {
|
||||
resourcesFolder.string() + " is not a directory"
|
||||
);
|
||||
}
|
||||
logger.info() << "executable path: " << platform::get_executable_path().string();
|
||||
logger.info() << "resources folder: " << fs::canonical(resourcesFolder).u8string();
|
||||
logger.info() << "user files folder: " << fs::canonical(userFilesFolder).u8string();
|
||||
logger.info() << "project folder: " << fs::canonical(projectFolder).u8string();
|
||||
|
||||
@ -141,7 +141,7 @@ void SkeletonConfig::update(
|
||||
build_matrix(rotation, interpolation.getCurrent())
|
||||
);
|
||||
} else {
|
||||
update(0, skeleton, root.get(), rotation);
|
||||
update(0, skeleton, root.get(), build_matrix(rotation, position));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -10,13 +10,22 @@
|
||||
#include "stringutil.hpp"
|
||||
#include "typedefs.hpp"
|
||||
#include "debug/Logger.hpp"
|
||||
|
||||
static debug::Logger logger("platform");
|
||||
#include "frontend/locale.hpp"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <Windows.h>
|
||||
#pragma comment(lib, "winmm.lib")
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
namespace platform::internal {
|
||||
std::filesystem::path get_executable_path();
|
||||
}
|
||||
|
||||
static debug::Logger logger("platform");
|
||||
|
||||
#ifdef _WIN32
|
||||
void platform::configure_encoding() {
|
||||
// set utf-8 encoding to console output
|
||||
SetConsoleOutputCP(CP_UTF8);
|
||||
@ -83,9 +92,6 @@ bool platform::open_url(const std::string& url) {
|
||||
|
||||
#else // _WIN32
|
||||
|
||||
#include <unistd.h>
|
||||
#include "frontend/locale.hpp"
|
||||
|
||||
void platform::configure_encoding() {
|
||||
}
|
||||
|
||||
@ -158,3 +164,47 @@ void platform::open_folder(const std::filesystem::path& folder) {
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
std::filesystem::path platform::get_executable_path() {
|
||||
#ifdef _WIN32
|
||||
wchar_t buffer[MAX_PATH];
|
||||
DWORD result = GetModuleFileNameW(NULL, buffer, MAX_PATH);
|
||||
if (result == 0) {
|
||||
DWORD error = GetLastError();
|
||||
throw std::runtime_error("GetModuleFileName failed with code: " + std::to_string(error));
|
||||
}
|
||||
|
||||
int size = WideCharToMultiByte(
|
||||
CP_UTF8, 0, buffer, -1, nullptr, 0, nullptr, nullptr
|
||||
);
|
||||
if (size == 0) {
|
||||
throw std::runtime_error("could not get executable path");
|
||||
}
|
||||
std::string str(size, 0);
|
||||
size = WideCharToMultiByte(
|
||||
CP_UTF8, 0, buffer, -1, str.data(), size, nullptr, nullptr
|
||||
);
|
||||
if (size == 0) {
|
||||
DWORD error = GetLastError();
|
||||
throw std::runtime_error("WideCharToMultiByte failed with code: " + std::to_string(error));
|
||||
}
|
||||
str.resize(size - 1);
|
||||
return std::filesystem::path(str);
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
auto path = platform::internal::get_executable_path();
|
||||
if (path.empty()) {
|
||||
throw std::runtime_error("could not get executable path");
|
||||
}
|
||||
return path;
|
||||
#else
|
||||
char buffer[1024];
|
||||
ssize_t count = readlink("/proc/self/exe", buffer, sizeof(buffer));
|
||||
if (count != -1) {
|
||||
return std::filesystem::canonical(std::filesystem::path(
|
||||
std::string(buffer, static_cast<size_t>(count))
|
||||
));
|
||||
}
|
||||
throw std::runtime_error("could not get executable path");
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -5,13 +5,17 @@
|
||||
|
||||
namespace platform {
|
||||
void configure_encoding();
|
||||
/// @return environment locale in ISO format ll_CC
|
||||
/// @brief Get Environment locale in ISO format ll_CC
|
||||
std::string detect_locale();
|
||||
/// @brief Open folder using system file manager asynchronously
|
||||
/// @param folder target folder
|
||||
void open_folder(const std::filesystem::path& folder);
|
||||
/// Makes the current thread sleep for the specified amount of milliseconds.
|
||||
/// @brief Makes the current thread sleep for the specified amount of milliseconds.
|
||||
void sleep(size_t millis);
|
||||
/// @brief Get current process id
|
||||
int get_process_id();
|
||||
/// @brief Get current process running executable path
|
||||
std::filesystem::path get_executable_path();
|
||||
/// @brief Open URL in web browser
|
||||
bool open_url(const std::string& url);
|
||||
}
|
||||
|
||||
24
src/util/platform_internal.cpp
Normal file
24
src/util/platform_internal.cpp
Normal file
@ -0,0 +1,24 @@
|
||||
#include <filesystem>
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <mach-o/dyld.h>
|
||||
#endif
|
||||
|
||||
namespace platform::internal {
|
||||
std::filesystem::path get_executable_path() {
|
||||
#ifdef __APPLE__
|
||||
char buffer[1024];
|
||||
uint32_t size = sizeof(buffer);
|
||||
if (_NSGetExecutablePath(buffer, &size) == 0) {
|
||||
return std::filesystem::canonical(std::filesystem::path(buffer));
|
||||
} else {
|
||||
return std::filesystem::path();
|
||||
}
|
||||
#endif
|
||||
return std::filesystem::path();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user