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:
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-09-14 02:08:27 +0400
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-09-14 02:08:27 +0400
commita4532b202b960fcff3049fa047c8e828802e91ce (patch)
tree68b08f2caf88990aadfaefa02366da806772bf2d /source/nan_definitions.mk
parent7e7a6a193e48ce8a34e11eebefbf2423c9c6b444 (diff)
Prepare for removal of FFMPEG from extern.
make clean and full rebuild recommended.
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk12
1 files changed, 3 insertions, 9 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index f8afc7f3fa6..8c47bcf11c1 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -138,9 +138,9 @@ ifndef CONFIG_GUESS
endif
ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
- export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)
- export NAN_FFMPEGLIBS ?= $(shell ffmpeg-config --libs avformat avcodec)
- export NAN_FFMPEGCFLAGS ?= $(shell ffmpeg-config --cflags)
+ export NAN_FFMPEG = $(shell pkg-config --variable=prefix libavcodec) # Assume they are all in the same prefix
+ export NAN_FFMPEGLIBS = $(shell pkg-config --libs libavcodec libavdevice libavformat libswscale libavutil)
+ export NAN_FFMPEGCFLAGS = $(shell pkg-config --cflags libavcodec libavdevice libavformat libswscale libavutil)
endif
# Platform Dependent settings go below:
@@ -336,12 +336,6 @@ ifndef CONFIG_GUESS
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
export NAN_SAMPLERATE ?= /usr
-ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
- export NAN_FFMPEG ?= /usr
- export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -lswscale -lavdevice -ldts -lz
- export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
-endif
-
ifeq ($(WITH_OPENEXR), true)
export NAN_OPENEXR ?= $(shell pkg-config --variable=prefix OpenEXR )
export NAN_OPENEXR_INC ?= $(shell pkg-config --cflags OpenEXR )