From 474687f7aae2920d727df508466467b72a3934af Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Thu, 8 Dec 2011 03:58:06 +0000
Subject: [PATCH] bullet build script: - better separation between 32 and 64bit
 cross-compile windows binaries in config script fix

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

diff --git a/engine/nbproject/build-bullet-natives.xml b/engine/nbproject/build-bullet-natives.xml
index 68b913f0e..ce42d8000 100644
--- a/engine/nbproject/build-bullet-natives.xml
+++ b/engine/nbproject/build-bullet-natives.xml
@@ -422,13 +422,14 @@
     <target name="-compile-bullet-sources-linux-mingw-64" if="isLinux64" unless="haveBulletLibraryMingw64">
         <replace file="${bullet.folder}/CMakeLists.txt" token="#TODO add better GLUT detection for MinGW"
                 value="INCLUDE_DIRECTORIES($${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}
-                        IF (CMAKE_CL_64)${line.separator}
+                       SET(GLUT_INCLUDE_DIR ${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}
+                        IF (WIN32)${line.separator}
+                                message('Win32 using Glut/glut32.lib')${line.separator}
+                                SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)${line.separator}
+                        ELSE(WIN32)${line.separator}
                                 message('Win64 using Glut/glut64.lib')${line.separator}
                                 SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)${line.separator}
-                        ELSE(CMAKE_CL_64)${line.separator}
-                                message('Win32 using Glut/glut64.lib')${line.separator}
-                                SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)${line.separator}
-                        ENDIF (CMAKE_CL_64)${line.separator}"/>
+                        ENDIF (WIN32)${line.separator}"/>
         <property name="cross.compile.target" value="x86_64-w64-mingw32"/>
         <mkdir dir="build/bullet-base-mingw-64"/>
         <property location="build/bullet-base-mingw-64" name="build-mingw64.folder.resolved"/>