diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-05-10 20:25:23 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-05-10 20:25:23 +0400 |
| commit | 1ecddea4624856ff694fdeee9c643b2df54c536f (patch) | |
| tree | b36ac3d532010fdea1e299e1ff2be37da13bca93 /source | |
| parent | c5cfce5485a593100e361e8ebbb414e2fd8661da (diff) | |
Some modifications to get cygwin/msvc compiling/linking
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 2 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile index 97f149ae526..5de25fe0070 100644 --- 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 1ea2637b832..9072f07c5b2 100644 --- 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 |