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

bullet build script:

Browse Source 
- change 64bit check

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8883 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-12-08 00:13:36 +00:00
parent a56f306af6
commit 320f28a7ee
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engine/nbproject/build-bullet-natives.xml
View File

@ -14,11 +14,9 @@
<os family="unix" /> <os family="unix" />
</and> </and>
</condition> </condition>
<!-- condition for windows platform check -->
<condition property="isWindows"> <condition property="isWindows">
<os family="windows" /> <os family="windows" />
</condition> </condition>
<!-- condition for linux platform check -->
<condition property="isLinux"> <condition property="isLinux">
<and> <and>
<os family="unix"/> <os family="unix"/>
@ -30,13 +28,36 @@
</not> </not>
</and> </and>
</condition> </condition>
<!-- condition for x86_64 check -->
<condition property="is64bit"> <condition property="is64bit">
<or> <or>
<os arch="x86_64" /> <os arch="x86_64" />
<os arch="amd64" /> <os arch="amd64" />
</or> </or>
</condition> </condition>
<condition property="isWindows64">
<and>
<os family="windows" />
<or>
<os arch="x86_64" />
<os arch="amd64" />
</or>
</and>
</condition>
<condition property="isLinux64">
<and>
<os family="unix"/>
<not>
<os family="mac"/>
</not>
<not>
<os name="SunOS"/>
</not>
<or>
<os arch="x86_64" />
<os arch="amd64" />
</or>
</and>
</condition>
<condition property="ndk-build-name" value="ndk-build.cmd" else="ndk-build"> <condition property="ndk-build-name" value="ndk-build.cmd" else="ndk-build">
<os family="windows" /> <os family="windows" />
@ -197,7 +218,7 @@
<delete file="${bullet.output.dir}/linux/history.xml"/> <delete file="${bullet.output.dir}/linux/history.xml"/>
</target> </target>
<target name="-nativelib-linux-64" if="isLinux,is64bit"> <target name="-nativelib-linux-64" if="isLinux64">
<echo message="Building Linux version of native bullet"/> <echo message="Building Linux version of native bullet"/>
<mkdir dir="${bullet.output.dir}/linux"/> <mkdir dir="${bullet.output.dir}/linux"/>
<cc name="${bullet.linux.compiler}" warnings="severe" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/linux/${bullet.library.name}64" objdir="build/bullet-native64"> <cc name="${bullet.linux.compiler}" warnings="severe" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/linux/${bullet.library.name}64" objdir="build/bullet-native64">
@ -379,7 +400,7 @@
<exec executable="${make.linux}" dir="${bullet.folder}"/> <exec executable="${make.linux}" dir="${bullet.folder}"/>
</target> </target>
<target name="-compile-bullet-sources-linux-64" if="isLinux,is64bit" unless="haveBulletLibrary64"> <target name="-compile-bullet-sources-linux-64" if="isLinux64" unless="haveBulletLibrary64">
<mkdir dir="build/bullet-base-64"/> <mkdir dir="build/bullet-base-64"/>
<property location="build/bullet-base-64" name="build64.folder.resolved"/> <property location="build/bullet-base-64" name="build64.folder.resolved"/>
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true"> <exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">