Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/Makefile2
-rw-r--r--source/nan_definitions.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile
index 2709fe9a107..b4fd889adb2 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -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
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index af7be1392ac..f18bb574ddc 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -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)