Merge branch 'macos-rider-support' of https://github.com/wackoisgod/FlaxEngine into wackoisgod-macos-rider-support
This commit is contained in:
@@ -210,6 +210,23 @@ void RiderCodeEditor::FindEditors(Array<CodeEditor*>* output)
|
||||
TEXT("flatpak run com.jetbrains.Rider"));
|
||||
#endif
|
||||
|
||||
#if PLATFORM_MAC
|
||||
String applicationSupportFolder;
|
||||
FileSystem::GetSpecialFolderPath(SpecialFolder::ProgramData, applicationSupportFolder);
|
||||
|
||||
Array<String> subMacDirectories;
|
||||
|
||||
FileSystem::GetChildDirectories(subMacDirectories, applicationSupportFolder / TEXT("JetBrains/Toolbox/apps/Rider/ch-0/"));
|
||||
FileSystem::GetChildDirectories(subMacDirectories, applicationSupportFolder / TEXT("JetBrains/Toolbox/apps/Rider/ch-1/"));
|
||||
|
||||
for (auto directory : subMacDirectories) {
|
||||
String riderAppDirectory = directory / TEXT("Rider.app/Contents/Resources");
|
||||
SearchDirectory(&installations, riderAppDirectory);
|
||||
}
|
||||
// Check the local installer version
|
||||
SearchDirectory(&installations, TEXT("/Applications/Rider.app/Contents/Resources"));
|
||||
#endif
|
||||
|
||||
for (auto directory : subDirectories)
|
||||
SearchDirectory(&installations, directory);
|
||||
|
||||
|
||||
@@ -462,6 +462,9 @@ int32 MacPlatform::CreateProcess(CreateProcessSettings& settings)
|
||||
}
|
||||
}
|
||||
|
||||
// Sanatize the string if the exePath has spaces with properly espcaped spaces for popen
|
||||
exePath.Replace(TEXT(" "), TEXT("\\ "));
|
||||
|
||||
const String cmdLine = exePath + TEXT(" ") + settings.Arguments;
|
||||
const StringAsANSI<> cmdLineAnsi(*cmdLine, cmdLine.Length());
|
||||
FILE* pipe = popen(cmdLineAnsi.Get(), "r");
|
||||
|
||||
Reference in New Issue
Block a user