- fix jme3-bullet-natives build issue
This commit is contained in:
parent
32cfca495d
commit
98f0d2c08a
@ -140,10 +140,17 @@ compileJava.dependsOn {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
binaries.withType(StaticLibraryBinarySpec) {
|
||||||
|
buildable = false
|
||||||
|
}
|
||||||
|
|
||||||
// Adds all available binaries to java jar task
|
// Adds all available binaries to java jar task
|
||||||
binaries.withType(SharedLibraryBinary) { binary ->
|
binaries.withType(SharedLibraryBinary) { binary ->
|
||||||
// For all binaries that can't be built on the current system
|
// For all binaries that can't be built on the current system
|
||||||
if (!buildable || buildNativeProjects!="true") {
|
if(buildNativeProjects!="true"){
|
||||||
|
buildable = false;
|
||||||
|
}
|
||||||
|
if (!buildable) {
|
||||||
//Get from libs folder if no fresh build is available in the build folder and add to jar file
|
//Get from libs folder if no fresh build is available in the build folder and add to jar file
|
||||||
if(!binary.tasks.outputFile.get(0).exists()){
|
if(!binary.tasks.outputFile.get(0).exists()){
|
||||||
def fileName = binary.tasks.outputFile.get(0).getName();
|
def fileName = binary.tasks.outputFile.get(0).getName();
|
||||||
@ -176,23 +183,6 @@ binaries.withType(SharedLibraryBinary) { binary ->
|
|||||||
jar.dependsOn("copyBinaryToLibs${targetPlatform}")
|
jar.dependsOn("copyBinaryToLibs${targetPlatform}")
|
||||||
}
|
}
|
||||||
|
|
||||||
task {
|
|
||||||
// Remove all native build tasks, will be added as needed above
|
|
||||||
gradle.startParameter.excludedTaskNames += "windows_x86BulletjmeStaticLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "windows_x86_64BulletjmeStaticLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "linux_x86BulletjmeStaticLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "linux_x86_64BulletjmeStaticLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "osx_x86BulletjmeStaticLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "osx_x86_64BulletjmeStaticLibrary"
|
|
||||||
|
|
||||||
gradle.startParameter.excludedTaskNames += "windows_x86BulletjmeSharedLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "windows_x86_64BulletjmeSharedLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "linux_x86BulletjmeSharedLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "linux_x86_64BulletjmeSharedLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "osx_x86BulletjmeSharedLibrary"
|
|
||||||
gradle.startParameter.excludedTaskNames += "osx_x86_64BulletjmeSharedLibrary"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper class to wrap ant dowload task
|
// Helper class to wrap ant dowload task
|
||||||
class MyDownload extends DefaultTask {
|
class MyDownload extends DefaultTask {
|
||||||
@Input
|
@Input
|
||||||
|
Loading…
x
Reference in New Issue
Block a user