Explorar el Código

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.

Daniel Johansson hace 10 años
padre
commit
2080453430
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      jme3-bullet-native-android/build.gradle
  2. 1 1
      jme3-jbullet/build.gradle

+ 1 - 1
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
         }
     }

+ 1 - 1
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')
 }