From 08dc11ad7d0e2bc17b7fbe338bf9aa02bdc890e2 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Mon, 19 Mar 2018 19:20:06 -0500 Subject: [PATCH] Incremental improvements to Windows JDK library configuration This still doesn't actually work, but it's closer than it was before. There's still some problem with improper mixing of 32-bit ("x86") and 64-bit ("x64") libraries. --- com.ibm.wala.cast/build.gradle | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/com.ibm.wala.cast/build.gradle b/com.ibm.wala.cast/build.gradle index 262fc6a99..86abf2a97 100644 --- a/com.ibm.wala.cast/build.gradle +++ b/com.ibm.wala.cast/build.gradle @@ -40,23 +40,19 @@ model { switch (targetPlatform.operatingSystem.name) { case 'linux': headers.srcDirs "$jniIncludeDir/linux" + switch (targetPlatform.architecture.name) { + case 'x86-64': + sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/amd64/server/libjvm.so") + break + } break case 'osx': headers.srcDirs "$jniIncludeDir/darwin" + sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/server/libjvm.dylib") break case 'windows': headers.srcDirs "$jniIncludeDir/win32" - break - } - switch ("$targetPlatform.operatingSystem.name/$targetPlatform.architecture.name") { - case 'linux/x86-64': - sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/amd64/server/libjvm.so") - break - case 'osx/x86-64': - sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/server/libjvm.dylib") - break - case 'windows/x86-64': - sharedLibraryLinkFile = file("$currentJavaHome/jre/bin/server/jvm.dll") + sharedLibraryLinkFile = file("$currentJavaHome/lib/jvm.lib") break } }