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.
This commit is contained in:
Ben Liblit 2018-03-19 19:20:06 -05:00 committed by Ben Liblit
parent e8b86fdf82
commit 08dc11ad7d
1 changed files with 7 additions and 11 deletions

View File

@ -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
}
}