Merge pull request #45 from gpilab/develop

Restore gpi_make functionality on Windows

Author: borupdaniel

include/PyFI/PyFIArray.cpp

@@ -37,6 +37,7 @@ using namespace std;
 
 #include <stdio.h>
 #include <stdlib.h>
+#define _USE_MATH_DEFINES // Windows needs this to get M_PI and other constants
 #include <math.h> /* fabs */
 
 #include "PyFI/PyFIMacros.h"

include/PyFI/PyFIArray_WrappedFFTW.cpp

@@ -114,6 +114,7 @@
 #include "PyFI/PyFunctionIF.cpp"
 #include "PyFI/PyFIArray.cpp"
 
+#define _USE_MATH_DEFINES // Windows needs this to get M_PI and other constants
 #include <math.h>
 #include <fftw3.h>
 #include <string.h>

launch/gpi.command

@@ -52,7 +52,9 @@ elif [ "$(uname)" == "Linux" ]; then
     $PYTHON $GPI_LAUNCH -style cleanlooks $@
 # Windows
 else
-    python -u gpi_launch -style Windows $@
+    GPI_LAUNCH=${ANACONDA}/Scripts/gpi_launch
+    PYTHON=${ANACONDA}/python
+    ${PYTHON} -u ${GPI_LAUNCH} -style Windows $@
 fi
 
 

lib/gpi/make.py

@@ -244,6 +244,8 @@ def make(GPI_PREFIX=None):
     print("Adding GPI include directory")
     if GPI_PREFIX is not None:
         include_dirs.append(os.path.join(GPI_PREFIX, 'include'))
+        if platform.system() == 'Windows':
+            include_dirs.append(os.path.join(GPI_PREFIX, 'Library/include'))
 
     parser = optparse.OptionParser()
     parser.add_option('--preprocess', dest='preprocess', default=False,
@@ -328,8 +330,10 @@ def make(GPI_PREFIX=None):
     # Anaconda environment includes
     # includes FFTW and eigen
     print("Adding Anaconda lib and inc dirs...")
-    # include_dirs += [os.path.join(GPI_PREFIX, 'include')] - this is duplicated above
-    library_dirs += [os.path.join(GPI_PREFIX, 'lib')]
+    if platform.system() == 'Windows':
+        library_dirs += [os.path.join(GPI_PREFIX, 'Library/lib')]
+    else:
+        library_dirs += [os.path.join(GPI_PREFIX, 'lib')]
     include_dirs += [numpy.get_include()]
 
     # GPI library dirs