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:
parent
e8b86fdf82
commit
08dc11ad7d
|
@ -40,23 +40,19 @@ model {
|
||||||
switch (targetPlatform.operatingSystem.name) {
|
switch (targetPlatform.operatingSystem.name) {
|
||||||
case 'linux':
|
case 'linux':
|
||||||
headers.srcDirs "$jniIncludeDir/linux"
|
headers.srcDirs "$jniIncludeDir/linux"
|
||||||
|
switch (targetPlatform.architecture.name) {
|
||||||
|
case 'x86-64':
|
||||||
|
sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/amd64/server/libjvm.so")
|
||||||
|
break
|
||||||
|
}
|
||||||
break
|
break
|
||||||
case 'osx':
|
case 'osx':
|
||||||
headers.srcDirs "$jniIncludeDir/darwin"
|
headers.srcDirs "$jniIncludeDir/darwin"
|
||||||
|
sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/server/libjvm.dylib")
|
||||||
break
|
break
|
||||||
case 'windows':
|
case 'windows':
|
||||||
headers.srcDirs "$jniIncludeDir/win32"
|
headers.srcDirs "$jniIncludeDir/win32"
|
||||||
break
|
sharedLibraryLinkFile = file("$currentJavaHome/lib/jvm.lib")
|
||||||
}
|
|
||||||
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")
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue