Merge remote-tracking branch 'origin/master' into sincospi

setup.py

@@ -15,6 +15,7 @@ include_dirs = ['./', _deferred_pybind11_include(True),
                 _deferred_pybind11_include()]
 extra_compile_args = ['--std=c++11', '-march=native', '-O3']
 python_module_link_args = []
+define_macros = [('POCKETFFT_PTHREADS', None)]
 
 if sys.platform == 'darwin':
     import distutils.sysconfig
@@ -22,9 +23,12 @@ if sys.platform == 'darwin':
     vars = distutils.sysconfig.get_config_vars()
     vars['LDSHARED'] = vars['LDSHARED'].replace('-bundle', '')
     python_module_link_args += ['-bundle']
+elif sys.platform == 'win32':
+    define_macros = []
+    extra_compile_args = ['/Ox', '/EHsc']
 else:
-    extra_compile_args += ['-DPOCKETFFT_OPENMP', '-fopenmp', '-Wfatal-errors', '-Wfloat-conversion', '-Wsign-conversion', '-Wconversion' ,'-W', '-Wall', '-Wstrict-aliasing=2', '-Wwrite-strings', '-Wredundant-decls', '-Woverloaded-virtual', '-Wcast-qual', '-Wcast-align', '-Wpointer-arith']
-    python_module_link_args += ['-march=native', '-Wl,-rpath,$ORIGIN', '-fopenmp']
+    extra_compile_args += ['-Wfatal-errors', '-Wfloat-conversion', '-Wsign-conversion', '-Wconversion' ,'-W', '-Wall', '-Wstrict-aliasing=2', '-Wwrite-strings', '-Wredundant-decls', '-Woverloaded-virtual', '-Wcast-qual', '-Wcast-align', '-Wpointer-arith']
+    python_module_link_args += ['-march=native', '-Wl,-rpath,$ORIGIN']
 
 # if you don't want debugging info, add "-s" to python_module_link_args
 
@@ -35,6 +39,7 @@ def get_extension_modules():
                       sources=['pypocketfft.cc'],
                       depends=['pocketfft_hdronly.h'],
                       include_dirs=include_dirs,
+                      define_macros=define_macros,
                       extra_compile_args=extra_compile_args,
                       extra_link_args=python_module_link_args)]