MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

to make sure we find msvcr100.dll when loading jvm dll, set current directory to jre\bin

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-19 17:45:53 +02:00
parent 347e561806
commit 336d26e2dc
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/WinLauncher/WinLauncher.exe
View File

Binary file not shown.

BIN
bin/WinLauncher/WinLauncher64.exe
View File

Binary file not shown.

11
native/WinLauncher/WinLauncher/WinLauncher.cpp
View File

@@ -372,17 +372,20 @@ bool LoadVMOptions()
bool LoadJVMLibrary()
{
std::string dllName(jvmPath);
std::string serverDllName = dllName + "\\bin\\server\\jvm.dll";
std::string clientDllName = dllName + "\\bin\\client\\jvm.dll";
std::string binDir = dllName + "\\bin";
std::string serverDllName = binDir + "\\server\\jvm.dll";
std::string clientDllName = binDir + "\\client\\jvm.dll";
if ((bServerJVM && FileExists(serverDllName)) || !FileExists(clientDllName))
{
hJVM = LoadLibraryA(serverDllName.c_str());
dllName = serverDllName;
}
else
{
hJVM = LoadLibraryA(clientDllName.c_str());
dllName = clientDllName;
}
SetCurrentDirectoryA(binDir.c_str()); // ensure that we can find msvcr100.dll which is located in jre/bin directory
hJVM = LoadLibraryA(dllName.c_str());
if (hJVM)
{
pCreateJavaVM = (JNI_createJavaVM) GetProcAddress(hJVM, "JNI_CreateJavaVM");