jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-12-19 17:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

adaptive aligned std::array based vector types (#686)

Browse Source
This commit is contained in:
Jon Daniel
2025-05-08 12:36:35 -07:00
committed by GitHub
parent 19762b9282
commit adda1c1f15
131 changed files with 3396 additions and 3592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/module.cpp
View File

@@ -110,7 +110,7 @@ int ModLastError = MODERR_NOERROR;
std::filesystem::path mod_GetRealModuleName(const std::filesystem::path &mod_filename) {
std::filesystem::path filename = mod_filename;
std::string ext = mod_filename.extension().u8string();
std::string ext = (const char*)mod_filename.extension().u8string().c_str();
if (ext.empty()) {
filename.replace_extension(MODULE_EXT);
@@ -180,7 +180,7 @@ bool mod_LoadModule(module *handle, const std::filesystem::path &imodfilename, i
f |= RTLD_NOW;
if (flags & MODF_GLOBAL)
f |= RTLD_GLOBAL;
handle->handle = dlopen(modfilename.u8string().c_str(), f);
handle->handle = dlopen((const char*)modfilename.u8string().c_str(), f);
if (!handle->handle) {
// ok we couldn't find the given name...try other ways
std::filesystem::path parent_path = modfilename.parent_path().filename();
@@ -196,7 +196,7 @@ bool mod_LoadModule(module *handle, const std::filesystem::path &imodfilename, i
LOG_DEBUG.printf("MOD: Attempting to open %s instead of %s", new_filename.u8string().c_str(),
modfilename.u8string().c_str());
modfilename = parent_path / new_filename;
handle->handle = dlopen(modfilename.u8string().c_str(), f);
handle->handle = dlopen((const char*)modfilename.u8string().c_str(), f);
if (!handle->handle) {
LOG_ERROR.printf("Module Load Err: %s", dlerror());
ModLastError = MODERR_MODNOTFOUND;