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.

This commit is contained in:
Daniel Johansson 2015-07-12 19:18:18 +01:00
parent 013f67ee89
commit 2080453430
2 changed files with 2 additions and 2 deletions

View File

@ -21,6 +21,7 @@ if (!hasProperty('mainClass')) {
} }
dependencies { dependencies {
compile project(':jme3-bullet-native')
compile project(':jme3-bullet') compile project(':jme3-bullet')
} }
@ -28,7 +29,6 @@ dependencies {
sourceSets { sourceSets {
main { main {
java { java {
srcDir jmeCppPath
srcDir jmeAndroidPath srcDir jmeAndroidPath
} }
} }

View File

@ -6,7 +6,6 @@ sourceSets {
main { main {
java { java {
srcDir 'src/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 files('../lib/jbullet.jar', '../lib/stack-alloc.jar')
compile project(':jme3-core') compile project(':jme3-core')
compile project(':jme3-terrain') compile project(':jme3-terrain')
compile project(':jme3-bullet')
} }