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.
experimental
iwgeric 10 years ago
parent c6d0856480
commit fb04910980
  1. 4
      jme3-android-native/decode.gradle
  2. 2
      jme3-android-native/openalsoft.gradle
  3. 2
      settings.gradle

@ -40,7 +40,7 @@ task copyTremorFiles(type: Copy) {
include '*.c' include '*.c'
include '*.h' include '*.h'
} }
into outputDir into outputDir
} }
@ -85,7 +85,7 @@ task copyPreCompiledLibs(type: Copy) {
into outputDir into outputDir
} }
if (rootProject.ndkExists) { if (rootProject.ndkExists && rootProject.buildNativeProjects) {
// build native libs and update stored pre-compiled libs to commit // build native libs and update stored pre-compiled libs to commit
compileJava.dependsOn { updatePreCompiledLibs } compileJava.dependsOn { updatePreCompiledLibs }
} else { } else {

@ -111,7 +111,7 @@ task copyPreCompiledOpenAlSoftLibs(type: Copy) {
into outputDir into outputDir
} }
if (rootProject.ndkExists) { if (rootProject.ndkExists && rootProject.buildNativeProjects) {
// build native libs and update stored pre-compiled libs to commit // build native libs and update stored pre-compiled libs to commit
compileJava.dependsOn { updatePreCompiledOpenAlSoftLibs } compileJava.dependsOn { updatePreCompiledOpenAlSoftLibs }
} else { } else {

@ -26,10 +26,10 @@ include 'jme3-ios'
//native builds //native builds
include 'jme3-bullet' //java include 'jme3-bullet' //java
if(buildNativeProjects == "true"){ if(buildNativeProjects == "true"){
include 'jme3-android-native' //cpp
include 'jme3-bullet-native' //cpp include 'jme3-bullet-native' //cpp
include 'jme3-bullet-native-android' //cpp include 'jme3-bullet-native-android' //cpp
} }
include 'jme3-android-native' //cpp
// Test Data project // Test Data project
include 'jme3-testdata' include 'jme3-testdata'

Loading…
Cancel
Save