diff options
| author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-09-14 02:08:27 +0400 |
|---|---|---|
| committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-09-14 02:08:27 +0400 |
| commit | a4532b202b960fcff3049fa047c8e828802e91ce (patch) | |
| tree | 68b08f2caf88990aadfaefa02366da806772bf2d | |
| parent | 7e7a6a193e48ce8a34e11eebefbf2423c9c6b444 (diff) | |
Prepare for removal of FFMPEG from extern.
make clean and full rebuild recommended.
| -rw-r--r-- | extern/Makefile | 9 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 12 |
2 files changed, 3 insertions, 18 deletions
diff --git a/extern/Makefile b/extern/Makefile index 1bebf1e1994..b81fbd2b91a 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -32,15 +32,6 @@ SOURCEDIR = extern DIR = $(OCGDIR)/extern DIRS = glew/src -ifeq ($(WITH_FFMPEG), true) -ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg) - DIRS += ffmpeg -endif -ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg) - DIRS += ffmpeg -endif -endif - # Cloth requires it #ifneq ($(NAN_NO_KETSJI), true) DIRS += bullet2 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 ) |