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:
authorPeter Schlaile <peter@schlaile.de>2006-06-25 23:02:38 +0400
committerPeter Schlaile <peter@schlaile.de>2006-06-25 23:02:38 +0400
commit63a1f2515e92a496120b216a1bf2005997332d4d (patch)
treedfd8649fa128d9c7df91d5c8e601739743cd93e8 /source/nan_definitions.mk
parent3f34e2a180807dc307cb93b7ba0c4be632847e8a (diff)
==FFMPEG==
forgot to commit nan_definition changes
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index d0b6c953e07..6e96b48c19d 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -92,9 +92,11 @@ endif
export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg
export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavutil -lavcodec
export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
-
else
export NAN_FTGL ?= $(LCGDIR)/ftgl
+ export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg
+ export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavutil -lavcodec
+ export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
endif
export WITH_OPENEXR ?= true