sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Some modifications to get cygwin/msvc compiling/linking

Browse Source
This commit is contained in:
Chris Want 2003-05-10 16:25:23 +00:00
parent c5cfce5485
commit 1ecddea462
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Makefile
View File

@ -147,7 +147,7 @@ ifeq ($(INTERNATIONAL), true)
else else
COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.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 COMLIB += $(NAN_ICONV)/lib/iconv.lib
endif endif
else else

3
source/nan_definitions.mk
View File

@ -341,8 +341,9 @@ all debug::
export ID = $(LOGNAME) export ID = $(LOGNAME)
export NAN_PYTHON ?= $(LCGDIR)/python export NAN_PYTHON ?= $(LCGDIR)/python
export NAN_ICONV ?= $(LCGDIR)/iconv
export NAN_PYTHON_VERSION ?= 2.2 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 \ export NAN_MXTEXTTOOLS ?= $(shell $(NAN_PYTHON_BINARY) -c \
'import mx; print mx.__path__[0]')/TextTools/mxTextTools/mxTextTools.so 'import mx; print mx.__path__[0]')/TextTools/mxTextTools/mxTextTools.so
export NAN_OPENAL ?= $(LCGDIR)/openal export NAN_OPENAL ?= $(LCGDIR)/openal