MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Windows 64-bit launcher looks for bundled jre in both jre and jre64 folders

Browse Source 
(cherry picked from commit 758810a)
This commit is contained in:
Anton Makeev
2014-09-04 08:47:27 +02:00
parent fbbef502ed
commit d14cfcea26
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/WinLauncher/WinLauncher.exe
BIN
View File
Binary file not shown.
bin/WinLauncher/WinLauncher64.exe
BIN
View File
Binary file not shown.
native/WinLauncher/WinLauncher/WinLauncher.cpp
+10 -5
View File
@@ -194,11 +194,16 @@ bool LocateJVM()
return result;
}
std::string jreDir = GetAdjacentDir(need64BitJRE ? "jre64":"jre");
if (FindValidJVM(jreDir.c_str()) && Is64BitJRE(jvmPath) == need64BitJRE)
{
return true;
}
std::vector<std::string> jrePaths;
if(need64BitJRE) jrePaths.push_back(GetAdjacentDir("jre64"));
jrePaths.push_back(GetAdjacentDir("jre"));
for(std::vector<std::string>::iterator it = jrePaths.begin(); it != jrePaths.end(); ++it) {
if (FindValidJVM((*it).c_str()) && Is64BitJRE(jvmPath) == need64BitJRE)
{
return true;
}
}
if (FindJVMInRegistry())
{