diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e793166c..301352b58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,10 +122,10 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
 ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE )
 ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
 
-IF (USE_GLUT)
+IF (USE_GLUT AND MSVC)
         string (REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
         remove_definitions(-D_WINDOWS )
-ENDIF (USE_GLUT)
+ENDIF()
 
 ELSE(WIN32)
 OPTION(USE_GLUT "Use Glut"	ON)
diff --git a/Extras/Serialize/BulletFileLoader/bChunk.h b/Extras/Serialize/BulletFileLoader/bChunk.h
index 6d720e3b8..beadbfa6c 100644
--- a/Extras/Serialize/BulletFileLoader/bChunk.h
+++ b/Extras/Serialize/BulletFileLoader/bChunk.h
@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define __BCHUNK_H__
 
 
-#ifdef _WIN32
+#if defined (_WIN32) && ! defined (__MINGW32__)
 	#define long64 __int64
 #else
 	#define long64 long long