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:
authorStefan Gartner <stefang@aon.at>2003-07-18 18:43:18 +0400
committerStefan Gartner <stefang@aon.at>2003-07-18 18:43:18 +0400
commit2b40962ea5a006369c4ecaa3315f0a70b98afdfe (patch)
treea2def8f727ebdea16accefb9922e79f0d5752ac5 /source/nan_definitions.mk
parentc8aed03108018c458f834d08281e7606b21a7f13 (diff)
properly fix the fix this time (I need more coffee...)
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 7589c4161dc..53f66939869 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -75,6 +75,11 @@ all debug::
export NAN_GHOST ?= $(LCGDIR)/ghost
export NAN_TEST_VERBOSITY ?= 1
export NAN_BMFONT ?= $(LCGDIR)/bmfont
+ ifeq ($(FREE_WINDOWS), true)
+ export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
+ else
+ export NAN_FTGL ?= $(LCGDIR)/ftgl
+ endif
export NAN_SDL ?= $(shell sdl-config --prefix)
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
@@ -101,15 +106,9 @@ all debug::
export NAN_NSPR ?= $(LCGDIR)/nspr
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_GETTEXT ?= $(LCGDIR)/gettext
- ifeq ($(FREE_WINDOWS), true)
- export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
- else
- export NAN_FTGL ?= $(LCGDIR)/ftgl
- endif
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
-
# Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET
# Location of MOZILLA/Netscape header files...