Browse Source

make JBullet the default for jme3-examples (instead of native Bullet)

Stephen Gold 4 years ago
parent
commit
346ced79cb
2 changed files with 3 additions and 28 deletions
  1. 1 2
      jme3-android-examples/build.gradle
  2. 2 26
      jme3-examples/build.gradle

+ 1 - 2
jme3-android-examples/build.gradle

@@ -53,8 +53,7 @@ dependencies {
     compile project(':jme3-android')
     compile project(':jme3-android-native')
     compile project(':jme3-effects')
-    compile project(':jme3-bullet')
-    compile project(':jme3-bullet-native-android')
+    compile project(':jme3-jbullet')
     compile project(':jme3-networking')
     compile project(':jme3-niftygui')
     compile project(':jme3-plugins')

+ 2 - 26
jme3-examples/build.gradle

@@ -21,12 +21,7 @@ dependencies {
     compile project(':jme3-core')
     compile project(':jme3-desktop')
     compile project(':jme3-effects')
-
-    // EITHER use jme3-bullet + jme3-bullet-native OR ELSE jme3-jbullet
-    compile project(':jme3-bullet')
-    compile project(':jme3-bullet-native')
-//    compile project(':jme3-jbullet')
-
+    compile project(':jme3-jbullet')
     compile project(':jme3-jogg')
     compile project(':jme3-lwjgl')
 //    compile project(':jme3-lwjgl3')
@@ -58,9 +53,7 @@ jar.doFirst{
     }
 }
 
-task dist (dependsOn: ['build', ':jme3-bullet:jar', ':jme3-android:jar', \
-                       ':jme3-android-native:jar', ':jme3-bullet-native-android:jar', \
-                       ':jme3-bullet-native:jar']) {
+task dist (dependsOn: ['build', ':jme3-android:jar', ':jme3-android-native:jar']) {
     doLast {
         // Copy all dependencies to ../dist/lib, remove versions from jar files
         configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact ->
@@ -80,18 +73,6 @@ task dist (dependsOn: ['build', ':jme3-bullet:jar', ':jme3-android:jar', \
             rename { "jMonkeyEngine3.jar" }
         }
 
-        // Copy bullet packages, remove version
-        copy {
-            from project(':jme3-bullet').jar.archivePath
-            into '../dist/opt/native-bullet'
-            rename {project(':jme3-bullet').name+".jar"}
-        }
-        copy {
-            from project(':jme3-bullet-native').jar.archivePath
-            into '../dist/opt/native-bullet'
-            rename {project(':jme3-bullet-native').name+".jar"}
-        }
-
         // Copy android packages, remove version
         copy {
             from project(':jme3-android').jar.archivePath
@@ -103,10 +84,5 @@ task dist (dependsOn: ['build', ':jme3-bullet:jar', ':jme3-android:jar', \
             into '../dist/opt/android'
             rename {project(':jme3-android-native').name+".jar"}
         }
-        copy {
-            from project(':jme3-bullet-native-android').jar.archivePath
-            into '../dist/opt/native-bullet'
-            rename {project(':jme3-bullet-native-android').name+".jar"}
-        }
     }
 }