Add support for non portable mode (#356)

This commit is contained in:
SSimco 2022-10-11 23:03:26 -07:00 committed by GitHub
parent 2b9edced81
commit d6ba61cf64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 233 additions and 163 deletions

View file

@ -306,11 +306,10 @@ bool TestWriteAccess(const fs::path& p)
}
// make path relative to Cemu directory
fs::path MakeRelativePath(const fs::path& path)
fs::path MakeRelativePath(const fs::path& base, const fs::path& path)
{
try
{
const fs::path base = ActiveSettings::GetPath();
return fs::relative(path, base);
}
catch (const std::exception&)

View file

@ -52,7 +52,7 @@ uint32_t GetPhysicalCoreCount();
// Creates a temporary file to test for write access
bool TestWriteAccess(const fs::path& p);
fs::path MakeRelativePath(const fs::path& path);
fs::path MakeRelativePath(const fs::path& base, const fs::path& path);
#ifdef HAS_DIRECTINPUT
bool GUIDFromString(const char* string, GUID& guid);

View file

@ -18,7 +18,7 @@ void libusbWrapper::init()
m_module = LoadLibraryW(L"libusb-1.0.dll");
if (!m_module)
{
const auto path = ActiveSettings::GetPath("resources/libusb-1.0.dll");
const auto path = ActiveSettings::GetDataPath("resources/libusb-1.0.dll");
m_module = LoadLibraryW(path.generic_wstring().c_str());
if (!m_module)
{