equal
deleted
inserted
replaced
345 TString libName = package.GetJVMLibraryFileName(); |
345 TString libName = package.GetJVMLibraryFileName(); |
346 #ifdef _WIN64 |
346 #ifdef _WIN64 |
347 if (FilePath::FileExists(_T("msvcr100.dll")) == true) { |
347 if (FilePath::FileExists(_T("msvcr100.dll")) == true) { |
348 javaLibrary.AddDependency(_T("msvcr100.dll")); |
348 javaLibrary.AddDependency(_T("msvcr100.dll")); |
349 } |
349 } |
|
350 |
|
351 TString runtimeBin = platform.GetPackageRuntimeBinDirectory(); |
|
352 SetDllDirectory(runtimeBin.c_str()); |
350 #else |
353 #else |
351 javaLibrary.AddDependencies( |
354 javaLibrary.AddDependencies( |
352 platform.FilterOutRuntimeDependenciesForPlatform( |
355 platform.FilterOutRuntimeDependenciesForPlatform( |
353 platform.GetLibraryImports(libName))); |
356 platform.GetLibraryImports(libName))); |
354 #endif |
357 #endif |