Merge pull request #570 from peastman/master

Fixed compilation errors on Windows

openmmapi/include/openmm/internal/OSRngSeed.h

-#ifndef OPENMM_OSRNGSEED_H_
+#ifndef OPENMM_OSRNGSEED_H_
 #define OPENMM_OSRNGSEED_H_
 
 
@@ -33,7 +33,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-
+#include "windowsExport.h"
 
 /**
  * Return an integer int for use as a seed for a random number generator.
@@ -42,6 +42,6 @@
  * this uses CryptGenRandom from the CryptoAPI to get a single int. On other
  * platforms (*nix, apple), we read from /dev/urandom
  */
-int osrngseed(void);
+int OPENMM_EXPORT osrngseed(void);
 
 #endif /* OPENMM_OSRNGSEED_H_ */
\ No newline at end of file

openmmapi/include/openmm/internal/hardware.h

@@ -46,6 +46,7 @@
    #ifdef WIN32
       #define NOMINMAX
       #include <windows.h>
+      #include <intrin.h>
    #else
       #ifdef __ANDROID__
         #include <cpu-features.h>
@@ -89,7 +90,7 @@ static int getNumProcessors() {
 /**
  * Get a description of the CPU's capabilities.
  */
-#ifdef _WIN32
+#ifdef WIN32
 #define cpuid __cpuid
 #else
 #if !defined(__ANDROID__) && !defined(__PNACL__)

wrappers/python/setup.py

@@ -202,18 +202,17 @@ def buildKeywordDictionary(major_version_num=MAJOR_VERSION_NUM,
     library_dirs=[openmm_lib_path]
     include_dirs=openmm_include_path.split(';')
 
-    setupKeywords["ext_modules"] = [
-       Extension(name = "simtk.openmm._openmm",
-                 sources = ["src/swig_doxygen/OpenMMSwig.cxx"],
-                 include_dirs = include_dirs,
-                 define_macros = define_macros,
-                 library_dirs = library_dirs,
-                 runtime_library_dirs = library_dirs,
-                 libraries = libraries,
-                 extra_compile_args=extra_compile_args,
-                 extra_link_args=extra_link_args,
-                 )
-    ]
+    extensionArgs = {"name": "simtk.openmm._openmm",
+                    "sources": ["src/swig_doxygen/OpenMMSwig.cxx"],
+                    "include_dirs": include_dirs,
+                    "define_macros": define_macros,
+                    "library_dirs": library_dirs,
+                    "libraries": libraries,
+                    "extra_compile_args": extra_compile_args,
+                    "extra_link_args": extra_link_args}
+    if platform.system() != "Windows":
+        extensionArgs["runtime_library_dirs"] = library_dirs
+    setupKeywords["ext_modules"] = [Extension(**extensionArgs)]
 
     outputString = ''
     firstTab     = 40