Browse Source

- add new library links to jMP

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7404 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
nor..67 14 years ago
parent
commit
7af64ddcd4

+ 4 - 4
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.script.CRC32=cdae6a36
[email protected]2.2
[email protected]5.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # 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.
 # 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.script.CRC32=246f9b81
-nbproject/[email protected]2.2
+nbproject/[email protected]5.1

+ 12 - 10
jme3-core-baselibs/nbproject/project.xml

@@ -28,16 +28,6 @@
                 <package>com.jme3.audio.lwjgl</package>
                 <package>com.jme3.audio.lwjgl</package>
                 <package>com.jme3.audio.plugins</package>
                 <package>com.jme3.audio.plugins</package>
                 <package>com.jme3.bounding</package>
                 <package>com.jme3.bounding</package>
-                <package>com.jme3.bullet</package>
-                <package>com.jme3.bullet.collision</package>
-                <package>com.jme3.bullet.collision.shapes</package>
-                <package>com.jme3.bullet.collision.shapes.infos</package>
-                <package>com.jme3.bullet.control</package>
-                <package>com.jme3.bullet.joints</package>
-                <package>com.jme3.bullet.joints.motors</package>
-                <package>com.jme3.bullet.objects</package>
-                <package>com.jme3.bullet.objects.infos</package>
-                <package>com.jme3.bullet.util</package>
                 <package>com.jme3.cinematic</package>
                 <package>com.jme3.cinematic</package>
                 <package>com.jme3.cinematic.events</package>
                 <package>com.jme3.cinematic.events</package>
                 <package>com.jme3.collision</package>
                 <package>com.jme3.collision</package>
@@ -115,6 +105,18 @@
                 <package>jme3tools.nvtex</package>
                 <package>jme3tools.nvtex</package>
                 <package>jme3tools.optimize</package>
                 <package>jme3tools.optimize</package>
             </public-packages>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-bullet-natives.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-bullet-natives.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-bullet.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-bullet.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-jbullet.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-jbullet.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jMonkeyEngine3.jar</runtime-relative-path>
                 <runtime-relative-path>ext/jMonkeyEngine3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jMonkeyEngine3.jar</binary-origin>
                 <binary-origin>release/modules/ext/jMonkeyEngine3.jar</binary-origin>

+ 24 - 0
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics-native.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version="1.0">
+    <name>jme3-libraries-physics-native</name>
+    <type>j2se</type>
+    <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives.jar!/</resource>
+    </volume>
+    <volume>
+        <type>src</type>
+
+    </volume>
+    <volume>
+        <type>javadoc</type>
+
+    </volume>
+</library>

+ 1 - 0
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics.xml

@@ -10,6 +10,7 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
     <volume>
         <type>classpath</type>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jbullet.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/</resource>

+ 1 - 0
jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml

@@ -10,6 +10,7 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
     <volume>
         <type>classpath</type>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-jbullet.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/</resource>

+ 1 - 0
jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml

@@ -7,6 +7,7 @@
             <file name="jme3-libraries-lwjgl-minimum.xml" url="jme3-libraries-lwjgl-minimum.xml"/>
             <file name="jme3-libraries-lwjgl-minimum.xml" url="jme3-libraries-lwjgl-minimum.xml"/>
             <file name="jme3-libraries-gui.xml" url="jme3-libraries-gui.xml"/>
             <file name="jme3-libraries-gui.xml" url="jme3-libraries-gui.xml"/>
             <file name="jme3-libraries-physics.xml" url="jme3-libraries-physics.xml"/>
             <file name="jme3-libraries-physics.xml" url="jme3-libraries-physics.xml"/>
+            <file name="jme3-libraries-physics-native.xml" url="jme3-libraries-physics-native.xml"/>
             <file name="jme3-libraries-video.xml" url="jme3-libraries-video.xml"/>
             <file name="jme3-libraries-video.xml" url="jme3-libraries-video.xml"/>
             <file name="jme3-libraries-oggvorbis.xml" url="jme3-libraries-oggvorbis.xml"/>
             <file name="jme3-libraries-oggvorbis.xml" url="jme3-libraries-oggvorbis.xml"/>
         </folder>
         </folder>