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:
authorChris Want <cwant@ualberta.ca>2006-02-06 09:22:39 +0300
committerChris Want <cwant@ualberta.ca>2006-02-06 09:22:39 +0300
commitb8988d8c1966ccbc288fae15364de9097a03f695 (patch)
tree05c48cbef3651c1ded99f2fae06df36676b36da0 /source/nan_definitions.mk
parent7263b0f6df0a8dae691427a5dadb931f5ca95c0b (diff)
Using NAN_FFMPEG_CFLAGS to find the right headers, and making linking
with NAN_FFMPEG_LIBS more general (i.e., not just for linux, and moving some of the linux linking stuff to source/nan_definitions.mk).
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index b8832cbb823..16e288cc1b8 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -330,6 +330,12 @@ endif
export NAN_SDLLIBS ?= $(shell sdl-config --libs)
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
+ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
+ export NAN_FFMPEG ?= /usr
+ export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -ldts -lz
+ export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
+endif
+
# Uncomment the following line to use Mozilla inplace of netscape
export CPPFLAGS += -DMOZ_NOT_NET
# Location of MOZILLA/Netscape header files...