diff --git a/sdk/jme3-core-baselibs/nbproject/genfiles.properties b/sdk/jme3-core-baselibs/nbproject/genfiles.properties index eb167e31a..dde1c9569 100644 --- a/sdk/jme3-core-baselibs/nbproject/genfiles.properties +++ b/sdk/jme3-core-baselibs/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=e2184cca +build.xml.data.CRC32=71b4f227 build.xml.script.CRC32=cdae6a36 -build.xml.stylesheet.CRC32=a56c6a5b@1.42.2 +build.xml.stylesheet.CRC32=a56c6a5b@1.45.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=e2184cca +nbproject/build-impl.xml.data.CRC32=71b4f227 nbproject/build-impl.xml.script.CRC32=246f9b81 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1 diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml index ad2a0b67d..34f13081a 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.xml +++ b/sdk/jme3-core-baselibs/nbproject/project.xml @@ -28,16 +28,6 @@ com.jme3.audio.lwjgl com.jme3.audio.plugins com.jme3.bounding - com.jme3.bullet - com.jme3.bullet.collision - com.jme3.bullet.collision.shapes - com.jme3.bullet.collision.shapes.infos - com.jme3.bullet.control - com.jme3.bullet.joints - com.jme3.bullet.joints.motors - com.jme3.bullet.objects - com.jme3.bullet.objects.infos - com.jme3.bullet.util com.jme3.cinematic com.jme3.cinematic.events com.jme3.collision @@ -115,6 +105,18 @@ jme3tools.nvtex jme3tools.optimize + + ext/jME3-bullet-natives.jar + release/modules/ext/jME3-bullet-natives.jar + + + ext/jME3-bullet.jar + release/modules/ext/jME3-bullet.jar + + + ext/jME3-jbullet.jar + release/modules/ext/jME3-jbullet.jar + ext/jMonkeyEngine3.jar release/modules/ext/jMonkeyEngine3.jar diff --git a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics-native.xml b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics-native.xml new file mode 100644 index 000000000..567d089c2 --- /dev/null +++ b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics-native.xml @@ -0,0 +1,24 @@ + + + + + jme3-libraries-physics-native + j2se + com.jme3.gde.project.libraries.Bundle + + classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/ + jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives.jar!/ + + + src + + + + javadoc + + + diff --git a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics.xml b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics.xml index eeafd03b3..89306414c 100644 --- a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics.xml +++ b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics.xml @@ -10,6 +10,7 @@ and open the template in the editor. com.jme3.gde.project.libraries.Bundle classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jbullet.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/ diff --git a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml index b04d01b63..242852301 100644 --- a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml +++ b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml @@ -10,6 +10,7 @@ and open the template in the editor. com.jme3.gde.project.libraries.Bundle classpath + jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-jbullet.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/ diff --git a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml index 8ab0510ae..b417f95e4 100644 --- a/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml +++ b/sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml @@ -7,6 +7,7 @@ +