sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- change bullet native build process and project

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8657 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-11-12 00:44:14 +00:00
parent 63ad4df79b
commit 270703ca58
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/build.xml
View File

@ -104,10 +104,19 @@
</target> </target>
<!-- compiles the *native binary* of the native bullet version (read bullet-native-build.txt for more info) --> <!-- compiles the *native binary* of the native bullet version (read bullet-native-build.txt for more info) -->
<target name="build-bullet-natives" description="uses native build tools to build the bulletjme binary (read bullet-native-build.txt for more info)"> <target name="build-bullet-natives" description="uses native build tools to build the bulletjme binary (read bullet-native-build.txt for more info)" depends="jar">
<ant antfile="src/bullet/native/build.xml" target="build-bullet-natives"/> <ant antfile="src/bullet/native/build.xml" target="build-bullet-natives"/>
</target> </target>
<target name="run-bullet-native" description="runs the jMonkeyEngine3 demos using native bullet">
<copy file="dist/opt/native-bullet/lib/jME3-bullet-natives.jar" todir="dist/lib" failonerror="false"/>
<copy file="dist/opt/native-bullet/lib/jME3-bullet.jar" todir="dist/lib" failonerror="false"/>
<delete file="dist/lib/jME3-jbullet.jar" failonerror="false"/>
<exec executable="java" dir="dist">
<arg line="-jar jMonkeyEngine3.jar"/>
</exec>
</target>
<!-- overrides javadoc generation to only include relevant classes --> <!-- overrides javadoc generation to only include relevant classes -->
<target depends="init" if="have.sources" name="-javadoc-build"> <target depends="init" if="have.sources" name="-javadoc-build">
<mkdir dir="${dist.javadoc.dir}"/> <mkdir dir="${dist.javadoc.dir}"/>

2
engine/src/bullet/native/build.xml
View File

@ -50,7 +50,7 @@
<target name="build-bullet-natives" description="builds the native bullet library for the platform being run on" depends="-create-folders, create-native-headers, -nativelib-osx, -nativelib-windows, -nativelib-linux, -nativelib-solaris"> <target name="build-bullet-natives" description="builds the native bullet library for the platform being run on" depends="-create-folders, create-native-headers, -nativelib-osx, -nativelib-windows, -nativelib-linux, -nativelib-solaris">
<echo message="Updating native jME3-bullet-natives.jar"/> <echo message="Updating native jME3-bullet-natives.jar"/>
<zip basedir="${bullet.output.base}/jarcontent" file="${bullet.output.base}/jME3-bullet-natives.jar" compress="true"/> <zip basedir="${bullet.output.base}/jarcontent" file="${bullet.output.base}/jME3-bullet-natives.jar" compress="true"/>
<copy file="${bullet.output.base}/jME3-bullet-natives.jar" todir="dist/lib"/> <copy file="${bullet.output.base}/jME3-bullet-natives.jar" todir="dist/opt/native-bullet/lib/"/>
</target> </target>
<target name="create-native-headers" description="creates the native headers"> <target name="create-native-headers" description="creates the native headers">

7
engine/src/bullet/nbproject/project.xml
View File

@ -22,7 +22,6 @@
<ide-actions> <ide-actions>
<action name="build"> <action name="build">
<script>${ant.script}</script> <script>${ant.script}</script>
<target>jar</target>
<target>build-bullet-natives</target> <target>build-bullet-natives</target>
</action> </action>
<action name="clean"> <action name="clean">
@ -32,9 +31,12 @@
<action name="rebuild"> <action name="rebuild">
<script>${ant.script}</script> <script>${ant.script}</script>
<target>clean</target> <target>clean</target>
<target>jar</target>
<target>build-bullet-natives</target> <target>build-bullet-natives</target>
</action> </action>
<action name="run">
<script>${ant.script}</script>
<target>run-bullet-native</target>
</action>
</ide-actions> </ide-actions>
<view> <view>
<items> <items>
@ -50,6 +52,7 @@
<ide-action name="build"/> <ide-action name="build"/>
<ide-action name="rebuild"/> <ide-action name="rebuild"/>
<ide-action name="clean"/> <ide-action name="clean"/>
<ide-action name="run"/>
</context-menu> </context-menu>
</view> </view>
<subprojects/> <subprojects/>