From 05c250536389062bae19cc35899518043a8644c9 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Wed, 14 Dec 2011 00:57:33 +0000
Subject: [PATCH] bullet native build: - fix native bullet build targets

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

diff --git a/engine/nbproject/build-bullet-natives.xml b/engine/nbproject/build-bullet-natives.xml
index a5061dabd..3f5c9292d 100644
--- a/engine/nbproject/build-bullet-natives.xml
+++ b/engine/nbproject/build-bullet-natives.xml
@@ -339,7 +339,7 @@
         <mkdir dir="build/bullet-native-mingw"/>
         <mkdir dir="${bullet.output.dir}/windows"/>
         <cc compilertarget="${cross.compile.target}" name="${bullet.linux.crosscompiler}" warnings="severe" debug="${bullet.compile.debug}"
-            outfile="${bullet.output.dir}/windows/${bullet.library.name}.dll" objdir="build/bullet-native-mingw">
+            outfile="${bullet.output.dir}/windows/${bullet.library.name}" objdir="build/bullet-native-mingw" outtype="shared">
             <fileset dir="${bullet.source.dir}">
                 <include name="*.cpp">
                 </include>
@@ -351,11 +351,11 @@
             <compilerarg value="-m32"/>
             <compilerarg value="-static-libgcc"/>
             <linker name="${bullet.linux.crosscompiler}">
-                <linkerarg value="-mdll"/>
                 <linkerarg value="-static"/>
                 <libset dir="build/bullet-base-mingw" libs="BulletMultiThreaded,BulletDynamics,BulletCollision,LinearMath"/>
             </linker>
         </cc>
+        <move file="${bullet.output.dir}/windows/lib${bullet.library.name}.so" tofile="${bullet.output.dir}/windows/${bullet.library.name}.dll" failonerror="false"/>
         <delete file="${bullet.output.dir}/windows/history.xml"/>
     </target>
     
@@ -364,7 +364,7 @@
         <mkdir dir="build/bullet-native-mingw-64"/>
         <mkdir dir="${bullet.output.dir}/windows"/>
         <cc compilertarget="${cross.compile.target64}" name="${bullet.linux.crosscompiler}" warnings="severe" debug="${bullet.compile.debug}"
-            outfile="${bullet.output.dir}/windows/${bullet.library.name}64.dll" objdir="build/bullet-native-mingw-64">
+            outfile="${bullet.output.dir}/windows/${bullet.library.name}64" objdir="build/bullet-native-mingw-64" outtype="shared">
             <fileset dir="${bullet.source.dir}">
                 <include name="*.cpp">
                 </include>
@@ -375,11 +375,11 @@
             <includepath path="${bullet.bullet.include}"/>
             <compilerarg value="-static-libgcc"/>
             <linker name="${bullet.linux.crosscompiler}">
-                <linkerarg value="-mdll"/>
                 <linkerarg value="-static"/>
                 <libset dir="build/bullet-base-mingw-64" libs="BulletMultiThreaded,BulletDynamics,BulletCollision,LinearMath"/>
             </linker>
         </cc>
+        <move file="${bullet.output.dir}/windows/lib${bullet.library.name}64.so" tofile="${bullet.output.dir}/windows/${bullet.library.name}64.dll" failonerror="false"/>
         <delete file="${bullet.output.dir}/windows/history.xml"/>
     </target>