forked from bartvdbraak/blender
-SDL links now on windows for cygwin-msvc and cygwin-gcc.
This commit is contained in:
parent
8dd015e9b0
commit
899a12a5cb
@ -158,12 +158,14 @@ ifeq ($(INTERNATIONAL), true)
|
||||
ifeq ($(FREE_WINDOWS), true)
|
||||
COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
|
||||
COMLIB += $(NAN_FTGL)/lib/libftgl.a
|
||||
COMLIB += $(NAN_SDL)/lib/libSDL.a
|
||||
#COMLIB += $(NAN_ICONV)/lib/freeiconv.a
|
||||
else
|
||||
COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
|
||||
COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
|
||||
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
|
||||
COMLIB += $(NAN_ICONV)/lib/iconv.lib
|
||||
COMLIB += $(NAN_SDL)/lib/SDL.lib
|
||||
endif
|
||||
else
|
||||
COMLIB += $(NAN_FTGL)/lib/libftgl.a
|
||||
|
@ -77,8 +77,10 @@ all debug::
|
||||
export NAN_BMFONT ?= $(LCGDIR)/bmfont
|
||||
ifeq ($(FREE_WINDOWS), true)
|
||||
export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
|
||||
export NAN_SDL ?= $(LCGDIR)/gcc/sdl
|
||||
else
|
||||
export NAN_FTGL ?= $(LCGDIR)/ftgl
|
||||
export NAN_SDL ?= $(LCGDIR)/sdl
|
||||
endif
|
||||
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
|
||||
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
|
||||
|
Loading…
Reference in New Issue
Block a user