Fix Windows Build

dilevin · Apr 8, 2018 · c2354ea · c2354ea
1 parent f2b660d
commit c2354ea
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,6 +63,7 @@ else()
     if(WIN32) 
         set (CMAKE_C_FLAGS /openmp ${CMAKE_C_FLAGS})
         set (CMAKE_CXX_FLAGS /openmp ${CMAKE_CXX_FLAGS})
+		add_definitions(-DWIN32)
     ELSE()
         set (CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS})
         set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS})

diff --git a/ThirdParty/fcl b/ThirdParty/fcl
diff --git a/ThirdParty/libccd b/ThirdParty/libccd
diff --git a/ThirdParty/libigl b/ThirdParty/libigl
diff --git a/src/Core/cpp/CoreOSSpecific.cpp b/src/Core/cpp/CoreOSSpecific.cpp
@@ -7,7 +7,7 @@
 #include <dirent.h>
 #endif
 
-#ifdef WIN32
+#if defined(_WIN32) || defined(_WIN64) || defined (WIN32)
 
 int Core::getDirectoryListing(std::vector<std::string> &list, const std::string &directoryName)
 {

diff --git a/src/Core/include/CoreDefines.h b/src/Core/include/CoreDefines.h
@@ -11,13 +11,13 @@
 #include <assert.h> 
 #include <iostream>
 
-#ifdef WIN32
+#if defined(_WIN32) || defined(_WIN64) || defined (WIN32)
     #define MEMCPY(dst, size, src, num) (memcpy_s((dst), (size), (src), (num)))
 #else
     #define MEMCPY(dst, size, src, num) (memcpy((dst), (src), (num)))
 #endif
 
-#ifdef WIN32
+#if defined(_WIN32) || defined(_WIN64) || defined (WIN32)
     #define MEMSET
 #else
     #define MEMSET(dst, val, num) (memset((dst), (val), (num)))

diff --git a/src/Core/include/CoreOSSpecific.h b/src/Core/include/CoreOSSpecific.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
 #define PATH_SEPARATOR '\\'
 #else
 #define PATH_SEPARATOR '/'

diff --git a/src/Core/include/Utilities.h b/src/Core/include/Utilities.h
@@ -134,7 +134,7 @@ namespace Gauss {
     };
 
     //Direct access into a tuple to run a designated function
-    #ifdef _WIN32
+	#if defined(_WIN32) || defined(_WIN64) || defined (WIN32)
         //Slow version that doesn't break Visual Studio Compiler
         template<unsigned int CheckIndex>
         class ApplyTuple {
+1 −1		CMakeLists.txt
+2 −2		include/fcl/narrowphase/detail/conservative_advancement_func_matrix-inl.h