Merge pull request #1256 from rmcgibbo/vs2015

Changes necessary for VS2015

CMakeLists.txt

@@ -65,6 +65,11 @@ ELSE(WIN32)
     ENDIF(NOT OPENMM_INSTALL_PREFIX)
 ENDIF(WIN32)
 
+IF(WIN32)
+    ADD_DEFINITIONS(-DWIN32)
+ENDIF(WIN32)
+
+
 # Include CPU-Features for Android
 IF (ANDROID)
     INCLUDE_DIRECTORIES(${ANDROID_NDK}/sources/cpufeatures)

libraries/pthreads/include/pthread.h

@@ -121,6 +121,9 @@
 #endif
 
 
+#if _MSC_VER >= 1900
+#include <ctime>
+#else
 /* Windows doesn't have this, so declare it ourselves. */
 struct timespec
 {
@@ -128,6 +131,7 @@ struct timespec
 	long long tv_sec;
 	long long tv_nsec;
 };
+#endif
 
 typedef struct _pthread_cleanup _pthread_cleanup;
 struct _pthread_cleanup