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

look for adjacent dir relative to .exe dir, not current dirr

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-04-09 10:02:19 +02:00
parent ff169ee692
commit a7a2238cb0
3 changed files with 6 additions and 2 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
+6 -2
View File
@@ -104,8 +104,12 @@ bool FindValidJVM(const char* path)
std::string GetAdjacentDir(const char* suffix)
{
char libDir[_MAX_PATH];
GetCurrentDirectoryA(_MAX_PATH-1, libDir);
GetModuleFileNameA(NULL, libDir, _MAX_PATH-1);
char* lastSlash = strrchr(libDir, '\\');
if (!lastSlash) return "";
*lastSlash = '\0';
lastSlash = strrchr(libDir, '\\');
if (!lastSlash) return "";
strcpy(lastSlash+1, suffix);
strcat_s(libDir, "\\");
return std::string(libDir);
@@ -261,7 +265,7 @@ std::string FindToolsJar()
std::string CollectLibJars(const std::string& jarList)
{
std::string libDir = GetAdjacentDir("lib");
if (!FileExists(libDir))
if (libDir.size() == 0 || !FileExists(libDir))
{
return "";
}