Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-05-05 10:32:33 +08:00
commit 2c79eebb23
229 changed files with 212 additions and 23172 deletions

View file

@ -110,14 +110,12 @@ GetPluginFile(const nsAString& aPluginPath,
nsAutoString baseName;
GetFileBase(aPluginPath, aLibDirectory, aLibFile, baseName);
#if defined(XP_MACOSX)
nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".dylib");
#elif defined(OS_POSIX)
#if defined(OS_POSIX)
nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".so");
#elif defined(XP_WIN)
nsAutoString binaryName = baseName + NS_LITERAL_STRING(".dll");
#else
#error not defined
#error Unsupported O.S.
#endif
aLibFile->AppendRelativePath(binaryName);
return true;