Fixed Windows build (using conda).

pelson · pelson · commit 05b39d7c657c · 2014-11-12T12:46:31.000Z
diff --git a/conda-requirements.txt b/conda-requirements.txt
@@ -0,0 +1,12 @@
+numpy
+dateutil
+freetype
+nose
+pyparsing
+pytz
+tornado
+libpng
+zlib 
+pyqt 
+distribute
+mock
diff --git a/setupext.py b/setupext.py
@@ -1457,6 +1457,8 @@ def hardcoded_tcl_config(self):
 
     def add_flags(self, ext):
         if sys.platform == 'win32':
+            # We hardcode the tk versions for Windows - there is no
+            # fundamental reason for this, and we should fix it.
             major, minor1, minor2, s, tmp = sys.version_info
             if sys.version_info[0:2] < (3, 4):
                 ext.include_dirs.extend(['win32_static/include/tcl85'])
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -1,5 +1,6 @@
 #include "numpy_cpp.h"
 
+#include "mplutils.h"
 #include "_path.h"
 
 #include "py_converters.h"
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -5,7 +5,6 @@
 #include <string>
 
 #include "ft2font.h"
-#include "mplutils.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338328
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -4,7 +4,8 @@
 #ifndef _FT2FONT_H
 #define _FT2FONT_H
 #include <vector>
-#include <stdint.h>
+
+#include "mplutils.h"
 
 extern "C" {
 #include <ft2build.h>
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -6,7 +6,12 @@
 #define _MPLUTILS_H
 
 #if defined(_MSC_VER) && _MSC_VER <= 1600
-typedef unsigned __int8   uint8_t;
+// http://stackoverflow.com/a/127166/4237086
+typedef unsigned char uint8_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
 #else
 #include <stdint.h>
 #endif
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -175,14 +175,15 @@ struct type_num_of<npy_clongdouble>
         value = NPY_CLONGDOUBLE
     };
 };
-#endif
 template <>
 struct type_num_of<std::complex<npy_longdouble> >
 {
     enum {
         value = NPY_CLONGDOUBLE
     };
 };
+#endif
+
 template <>
 struct type_num_of<PyObject *>
 {
diff --git a/windows_build_steps.txt b/windows_build_steps.txt
@@ -0,0 +1,13 @@
+http://www.activestate.com/activetcl/downloads/thank-you?dl=http://downloads.activestate.com/ActiveTcl/releases/8.5.16.0/ActiveTcl8.5.16.0.298506-win32-ix86-threaded.exes
+
+
+conda install --file conda-requirements.txt
+
+call Visual Studio 9\VC\vcvarsall.bat
+
+set INCLUDE=%INCLUDE%;C:\Users\Will\Miniconda\Library\include;C:\tcl\include
+
+set LIB=%LIB%;C:\Users\Will\Miniconda\Library\lib;C:\tcl\lib
+set PATH=%PATH%;C:\Users\Will\Miniconda\Library\bin
+
+copy libpng.lib to png.lib
