Merge pull request #83 from digitalillusions/master

MinGW Compatibility

Author: janbender

CMake/Common.cmake

@@ -29,7 +29,7 @@ if(USE_OpenMP)
 	endif()
 endif()
 
-if (WIN32)
+if (MSVC)
     set(CMAKE_USE_RELATIVE_PATHS "1")
     # Set compiler flags
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /bigobj")
@@ -38,15 +38,18 @@ if (WIN32)
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
     set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO")
-endif (WIN32)
+endif (MSVC)
 
-if (UNIX)
+if (UNIX OR MINGW)
     set(CMAKE_USE_RELATIVE_PATHS "1")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
     # Set compiler flags for "release"
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native")
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=native") 
-endif (UNIX)
+endif (UNIX OR MINGW)
+if(MINGW)
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1 -Wa,-mbig-obj")
+endif(MINGW)
 
 if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)

Utils/FileSystem.h

@@ -13,6 +13,11 @@
 #include <unistd.h>
 #endif
 
+#if (defined(__MINGW32__) || defined(__MINGW64__))
+#include <sys/stat.h>
+#endif
+
+
 namespace Utilities
 {
 	/** \brief This class implements different file system functions.

Utils/IndexedFaceMesh.cpp

@@ -18,7 +18,7 @@ IndexedFaceMesh& IndexedFaceMesh::operator=(IndexedFaceMesh const& other)
     for (size_t i(0u); i < m_faces.size(); ++i)
     {
         m_faces[i].m_edges = new unsigned int[m_verticesPerFace];
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64)	    
+#if defined(_MSC_VER)
         std::copy(other.m_faces[i].m_edges, other.m_faces[i].m_edges + m_verticesPerFace,
             stdext::unchecked_array_iterator<unsigned int*>(m_faces[i].m_edges));
 #else

Utils/IndexedFaceMesh.h

@@ -39,7 +39,7 @@ namespace Utilities
 			{
 				m_numFaces = other.m_numFaces;
 				m_fIndices = new unsigned int[m_numFaces];
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64)		
+#if defined(_MSC_VER)
 				std::copy(other.m_fIndices, other.m_fIndices + m_numFaces,
 					stdext::unchecked_array_iterator<unsigned int*>(m_fIndices));
 #else
@@ -75,7 +75,7 @@ namespace Utilities
 			{
 				m_numEdges = other.m_numEdges;
 				m_eIndices = new unsigned int[m_numEdges];
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64)		
+#if defined(_MSC_VER)
 				std::copy(other.m_eIndices, other.m_eIndices + m_numEdges,
 					stdext::unchecked_array_iterator<unsigned int*>(m_eIndices));
 #else