FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-02-13 11:13:38 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Thunks/gen: Add support for libraries with "-" in the filename

Browse Source
This commit is contained in:
Tony Wasserka 2021-12-10 11:24:59 +01:00
parent a2c02ae51e
commit 99bf02f27f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ThunkLibs/Generator/gen.cpp
View File

@ -377,7 +377,13 @@ public:
};
FrontendAction::FrontendAction(const std::string& libname_, const OutputFilenames& output_filenames_)
: libname(libname_), output_filenames(output_filenames_) {
: libfilename(libname_), libname(libname_), output_filenames(output_filenames_) {
for (auto& c : libname) {
if (c == '-') {
c = '_';
}
}
thunks.clear();
thunked_api.clear();
namespaces.clear();
@ -628,7 +634,7 @@ void FrontendAction::EndSourceFileAction() {
if (lib_version) {
version_suffix = '.' + std::to_string(*lib_version);
}
const std::string library_filename = libname + ".so" + version_suffix;
const std::string library_filename = libfilename + ".so" + version_suffix;
file << " fexldr_ptr_" << libname << "_so = dlopen(\"" << library_filename << "\", RTLD_LOCAL | RTLD_LAZY);\n";
file << " if (!fexldr_ptr_" << libname << "_so) { return false; }\n\n";

3
ThunkLibs/Generator/interface.h
View File

@ -32,6 +32,7 @@ public:
std::unique_ptr<clang::ASTConsumer> CreateASTConsumer(clang::CompilerInstance&, clang::StringRef /*file*/) override;
private:
const std::string& libname;
const std::string& libfilename;
std::string libname; // sanitized filename, usable as part of emitted function names
const OutputFilenames& output_filenames;
};