From 0869880c8e0167e4a765ab05b7b1f85a455e20bd Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Wed, 15 Jul 2015 10:24:04 +0100 Subject: [PATCH] Reverted changes to build script regarding bullet libs. --- jme3-bullet-native-android/build.gradle | 3 ++- jme3-jbullet/build.gradle | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jme3-bullet-native-android/build.gradle b/jme3-bullet-native-android/build.gradle index a640fcf93..3aa000c1e 100644 --- a/jme3-bullet-native-android/build.gradle +++ b/jme3-bullet-native-android/build.gradle @@ -21,7 +21,7 @@ if (!hasProperty('mainClass')) { } dependencies { - compile project(':jme3-bullet-native') +// compile project(':jme3-bullet-native') compile project(':jme3-bullet') } @@ -29,6 +29,7 @@ dependencies { sourceSets { main { java { + srcDir jmeCppPath srcDir jmeAndroidPath } } diff --git a/jme3-jbullet/build.gradle b/jme3-jbullet/build.gradle index 763a9e57b..0e3967ab2 100644 --- a/jme3-jbullet/build.gradle +++ b/jme3-jbullet/build.gradle @@ -6,6 +6,7 @@ sourceSets { main { java { srcDir 'src/main/java' + srcDir '../jme3-bullet/src/common/java' } } } @@ -15,5 +16,5 @@ dependencies { compile files('../lib/jbullet.jar', '../lib/stack-alloc.jar') compile project(':jme3-core') compile project(':jme3-terrain') - compile project(':jme3-bullet') +// compile project(':jme3-bullet') }