empirephoenix-patch-1
Kirill Vainer 7 years ago committed by Rémy Bouquet
parent 06599d1eac
commit 93001ec290
  1. 12
      build.gradle
  2. 3
      common.gradle
  3. 2
      jme3-android/build.gradle
  4. 6
      jme3-jbullet/build.gradle

@ -15,7 +15,7 @@ apply from: file('version.gradle')
subprojects { subprojects {
if(!project.name.equals('jme3-android-examples')) { if(!project.name.equals('jme3-android-examples')) {
apply from: rootProject.file('common.gradle') apply from: rootProject.file('common.gradle')
if (!['jme3-testdata', 'sdk'].contains(project.name)) { if (!project.name.equals('jme3-testdata')) {
apply from: rootProject.file('bintray.gradle') apply from: rootProject.file('bintray.gradle')
} }
} else { } else {
@ -66,9 +66,9 @@ task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"P
archiveName "jME" + jmeFullVersion + ".zip" archiveName "jME" + jmeFullVersion + ".zip"
into("/") { into("/") {
from {"./dist"} from {"./dist"}
} }
into("/sources") { into("/sources") {
from {"$buildDir/libDist/sources"} from {"$buildDir/libDist/sources"}
} }
} }
@ -88,14 +88,14 @@ task dist(dependsOn: [':jme3-examples:dist', 'mergedJavadoc']){
task mergedJavadoc(type: Javadoc, description: 'Creates Javadoc from all the projects.') { task mergedJavadoc(type: Javadoc, description: 'Creates Javadoc from all the projects.') {
title = 'jMonkeyEngine3' title = 'jMonkeyEngine3'
destinationDir = mkdir("dist/javadoc") destinationDir = mkdir("dist/javadoc")
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
// Allows Javadoc to be generated on Java 8 despite doclint errors. // Allows Javadoc to be generated on Java 8 despite doclint errors.
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
options.addStringOption('Xdoclint:none', '-quiet') options.addStringOption('Xdoclint:none', '-quiet')
} }
options.overview = file("javadoc-overview.html") options.overview = file("javadoc-overview.html")
// Note: The closures below are executed lazily. // Note: The closures below are executed lazily.
source subprojects.collect {project -> source subprojects.collect {project ->
@ -137,7 +137,7 @@ task configureAndroidNDK {
if (System.env.ANDROID_NDK != null) { if (System.env.ANDROID_NDK != null) {
ndkBuildPath = System.env.ANDROID_NDK + File.separator + ndkBuildFile ndkBuildPath = System.env.ANDROID_NDK + File.separator + ndkBuildFile
} }
if (new File(ndkBuildPath).exists()) { if (new File(ndkBuildPath).exists()) {
ndkExists = true ndkExists = true
ndkCommandPath = ndkBuildPath ndkCommandPath = ndkBuildPath

@ -16,6 +16,9 @@ repositories {
maven { maven {
url "http://nifty-gui.sourceforge.net/nifty-maven-repo" url "http://nifty-gui.sourceforge.net/nifty-maven-repo"
} }
flatDir {
dirs rootProject.file('lib')
}
} }
dependencies { dependencies {

@ -5,5 +5,5 @@ if (!hasProperty('mainClass')) {
dependencies { dependencies {
compile project(':jme3-core') compile project(':jme3-core')
compile project(':jme3-plugins') compile project(':jme3-plugins')
compile files('../lib/android.jar') compileOnly 'android:android'
} }

@ -12,9 +12,9 @@ sourceSets {
} }
dependencies { dependencies {
compile ('java3d:vecmath:1.3.1') compile 'java3d:vecmath:1.3.1'
compile files('../lib/jbullet.jar', '../lib/stack-alloc.jar') compile 'jbullet:jbullet'
compile 'stack-alloc:stack-alloc'
compile project(':jme3-core') compile project(':jme3-core')
compile project(':jme3-terrain') compile project(':jme3-terrain')
// compile project(':jme3-bullet')
} }

Loading…
Cancel
Save