Always include the jme3-android-native but only build based on "buildNativeProjects" property.
Needed to allow for the project to package the pre-compiled libs if not building the project.
This commit is contained in:
parent
c6d0856480
commit
fb04910980
@ -40,7 +40,7 @@ task copyTremorFiles(type: Copy) {
|
||||
include '*.c'
|
||||
include '*.h'
|
||||
}
|
||||
|
||||
|
||||
into outputDir
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ task copyPreCompiledLibs(type: Copy) {
|
||||
into outputDir
|
||||
}
|
||||
|
||||
if (rootProject.ndkExists) {
|
||||
if (rootProject.ndkExists && rootProject.buildNativeProjects) {
|
||||
// build native libs and update stored pre-compiled libs to commit
|
||||
compileJava.dependsOn { updatePreCompiledLibs }
|
||||
} else {
|
||||
|
@ -111,7 +111,7 @@ task copyPreCompiledOpenAlSoftLibs(type: Copy) {
|
||||
into outputDir
|
||||
}
|
||||
|
||||
if (rootProject.ndkExists) {
|
||||
if (rootProject.ndkExists && rootProject.buildNativeProjects) {
|
||||
// build native libs and update stored pre-compiled libs to commit
|
||||
compileJava.dependsOn { updatePreCompiledOpenAlSoftLibs }
|
||||
} else {
|
||||
|
@ -26,10 +26,10 @@ include 'jme3-ios'
|
||||
//native builds
|
||||
include 'jme3-bullet' //java
|
||||
if(buildNativeProjects == "true"){
|
||||
include 'jme3-android-native' //cpp
|
||||
include 'jme3-bullet-native' //cpp
|
||||
include 'jme3-bullet-native-android' //cpp
|
||||
}
|
||||
include 'jme3-android-native' //cpp
|
||||
|
||||
// Test Data project
|
||||
include 'jme3-testdata'
|
||||
|
Loading…
x
Reference in New Issue
Block a user