Some modifications to get cygwin/msvc compiling/linking

diff --git a/source/Makefile b/source/Makefile
index 97f149ae52607651a59eb4979369df56d40e5e45..5de25fe007033ff8f47c24e9232ce2b636a7da6b 100644 (file)
--- a/source/Makefile
+++ b/source/Makefile
@@ -147,7 +147,7 @@ ifeq ($(INTERNATIONAL), true)
         else
           COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
           COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
-          COMLIB += $(NAN_FREETYPE)/lib/freetype211ST.lib
+          COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib
           COMLIB += $(NAN_ICONV)/lib/iconv.lib
         endif
     else

diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 1ea2637b8328cef66673b90b687978f83ad7a91a..9072f07c5b229a33ee69ff3185f6ae1604aea21b 100644 (file)
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -341,8 +341,9 @@ all debug::
 
     export ID = $(LOGNAME)
     export NAN_PYTHON ?= $(LCGDIR)/python
+    export NAN_ICONV ?= $(LCGDIR)/iconv
     export NAN_PYTHON_VERSION ?= 2.2
-    export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
+    export NAN_PYTHON_BINARY ?= python
     export NAN_MXTEXTTOOLS ?= $(shell $(NAN_PYTHON_BINARY) -c \
        'import mx; print mx.__path__[0]')/TextTools/mxTextTools/mxTextTools.so
     export NAN_OPENAL ?= $(LCGDIR)/openal