From 2080453430726ece8ae05b4d9b5a3da4aacfb173 Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Sun, 12 Jul 2015 19:18:18 +0100 Subject: [PATCH] Changed build scripts slightly for bullet to not reference src outside it's own base dir. This was mainly done to be able to import the project correctly in IntelliJ IDEA. The modules will now instead reference each other through the dependency mechanism. --- jme3-bullet-native-android/build.gradle | 2 +- jme3-jbullet/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jme3-bullet-native-android/build.gradle b/jme3-bullet-native-android/build.gradle index 30fdd44b5..a640fcf93 100644 --- a/jme3-bullet-native-android/build.gradle +++ b/jme3-bullet-native-android/build.gradle @@ -21,6 +21,7 @@ if (!hasProperty('mainClass')) { } dependencies { + compile project(':jme3-bullet-native') compile project(':jme3-bullet') } @@ -28,7 +29,6 @@ dependencies { sourceSets { main { java { - srcDir jmeCppPath srcDir jmeAndroidPath } } diff --git a/jme3-jbullet/build.gradle b/jme3-jbullet/build.gradle index bcf1660bc..763a9e57b 100644 --- a/jme3-jbullet/build.gradle +++ b/jme3-jbullet/build.gradle @@ -6,7 +6,6 @@ sourceSets { main { java { srcDir 'src/main/java' - srcDir '../jme3-bullet/src/common/java' } } } @@ -16,4 +15,5 @@ dependencies { compile files('../lib/jbullet.jar', '../lib/stack-alloc.jar') compile project(':jme3-core') compile project(':jme3-terrain') + compile project(':jme3-bullet') }