From a56f306af6bf2007f34ed903453a6536805a8416 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Thu, 8 Dec 2011 00:06:15 +0000
Subject: [PATCH] bullet build script: - enable 64bit linux build

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8882 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/nbproject/build-bullet-natives.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/engine/nbproject/build-bullet-natives.xml b/engine/nbproject/build-bullet-natives.xml
index 52ee7ccb5..b11bcfcf2 100644
--- a/engine/nbproject/build-bullet-natives.xml
+++ b/engine/nbproject/build-bullet-natives.xml
@@ -31,8 +31,11 @@
         </and>
     </condition>
     <!-- condition for x86_64 check -->
-    <condition property="isx86_64">
-        <os arch="x86_64" />
+    <condition property="is64bit">
+        <or>
+            <os arch="x86_64" />
+            <os arch="amd64" />
+        </or>
     </condition>
     
     <condition property="ndk-build-name" value="ndk-build.cmd" else="ndk-build">
@@ -194,7 +197,7 @@
         <delete file="${bullet.output.dir}/linux/history.xml"/>
     </target>
     
-    <target name="-nativelib-linux-64" if="isLinux,isx86_64">
+    <target name="-nativelib-linux-64" if="isLinux,is64bit">
         <echo message="Building Linux version of native bullet"/>
         <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">
@@ -376,7 +379,7 @@
         <exec executable="${make.linux}" dir="${bullet.folder}"/>
     </target>
 
-    <target name="-compile-bullet-sources-linux-64" if="isLinux,isx86_64" unless="haveBulletLibrary64">
+    <target name="-compile-bullet-sources-linux-64" if="isLinux,is64bit" unless="haveBulletLibrary64">
         <mkdir dir="build/bullet-base-64"/>
         <property location="build/bullet-base-64" name="build64.folder.resolved"/>
         <exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">