From 068d626e6bc3b66bc808377c48ff8435bb0eb12f Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Fri, 9 Dec 2011 17:34:38 +0000 Subject: [PATCH] native bullet build: - clean up targets, add better condition checks for building and cross-building git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8908 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/nbproject/build-bullet-natives.xml | 287 ++++++++++++++++++---- engine/nbproject/bullet-native.properties | 5 +- 2 files changed, 238 insertions(+), 54 deletions(-) diff --git a/engine/nbproject/build-bullet-natives.xml b/engine/nbproject/build-bullet-natives.xml index 8409f72e1..5bf423c6c 100644 --- a/engine/nbproject/build-bullet-natives.xml +++ b/engine/nbproject/build-bullet-natives.xml @@ -34,30 +34,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -74,8 +50,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -157,7 +255,7 @@ - + @@ -167,7 +265,7 @@ - + @@ -198,7 +296,7 @@ - + @@ -218,7 +316,7 @@ - + @@ -236,12 +334,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -250,7 +371,6 @@ - @@ -259,7 +379,7 @@ - + @@ -290,7 +410,7 @@ - + @@ -361,24 +481,17 @@ - + - + Downloading bullet source.. - - - - - - - - - + + @@ -393,7 +506,7 @@ - + @@ -407,9 +520,19 @@ - + + + + + + + + + + + @@ -424,17 +547,39 @@ + + + + + + + + + + + + - + + + + + + + + + + + - - + @@ -442,7 +587,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/engine/nbproject/bullet-native.properties b/engine/nbproject/bullet-native.properties index e9de2666e..3dd841325 100644 --- a/engine/nbproject/bullet-native.properties +++ b/engine/nbproject/bullet-native.properties @@ -19,9 +19,10 @@ bullet.windows.compiler=g++ bullet.linux.compiler=g++ bullet.solaris.compiler=g++ #cross compilation options -bullet.linux.crosscompiler=gcc-cross +cross.compile=true cross.compile.target=i686-w64-mingw32 -cross.compile.target64=i686-w64-mingw32 +cross.compile.target64=x86_64-w64-mingw32 +bullet.linux.crosscompiler=gcc-cross # native header include directories bullet.java.include=${java.home}/../include # OSX has no JRE, only JDK