fix OSX build

CMakeLists.txt

@@ -16,15 +16,16 @@ ADD_DEFINITIONS( -D_IRR_STATIC_LIB_ )
 ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
 ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
 
-ELSE(WIN32)
-OPTION(USE_GLUT "Use Glut"	ON)
-ENDIF(WIN32)
-
 IF (USE_GLUT)
         string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
         remove_definitions(-D_WINDOWS )
 ENDIF (USE_GLUT)
 
+ELSE(WIN32)
+OPTION(USE_GLUT "Use Glut"	ON)
+ENDIF(WIN32)
+
+   
 IF(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
 ENDIF(COMMAND cmake_policy)

Demos/OpenGL/GlutStuff.h

@@ -31,12 +31,15 @@ subject to the following restrictions:
 #include <windows.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#define BT_ACTIVE_ALT	VK_LMENU
 #else
 #include <GL/glut.h>
+#endif //_WINDOWS
+#endif //APPLE
 
+#ifdef _WINDOWS
+#define BT_ACTIVE_ALT   VK_LMENU
 
-
+#else
 #define BT_KEY_K 'k'
 #define BT_KEY_LEFT			GLUT_KEY_LEFT
 #define BT_KEY_RIGHT		GLUT_KEY_RIGHT
@@ -54,8 +57,6 @@ subject to the following restrictions:
 #define BT_ACTIVE_ALT		GLUT_ACTIVE_ALT
 #define	BT_ACTIVE_CTRL		GLUT_ACTIVE_ALT
 #define BT_ACTIVE_SHIFT		GLUT_ACTIVE_SHIFT
-
-#endif
 #endif
 
 #if BT_USE_FREEGLUT

src/LinearMath/btSerializer.h

@@ -19,6 +19,9 @@ subject to the following restrictions:
 #include "btScalar.h" // has definitions like SIMD_FORCE_INLINE
 #include "btStackAlloc.h"
 #include "btHashMap.h"
+#include <memory.h>
+#include <string.h>
+
 
 ///only the 32bit versions for now
 extern unsigned char sBulletDNAstr[];