Revision: 23196
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23196
Author: gsrb3d
Date: 2009-09-14 00:08:27 +0200 (Mon, 14 Sep 2009)
Log Message:
-----------
Prepare for removal of FFMPEG from extern.
make clean and full rebuild recommended.
Modified Paths:
--------------
trunk/blender/extern/Makefile
trunk/blender/source/nan_definitions.mk
Modified: trunk/blender/extern/Makefile
===================================================================
--- trunk/blender/extern/Makefile 2009-09-13 21:36:24 UTC (rev 23195)
+++ trunk/blender/extern/Makefile 2009-09-13 22:08:27 UTC (rev 23196)
@@ -32,15 +32,6 @@
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
Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk 2009-09-13 21:36:24 UTC (rev
23195)
+++ trunk/blender/source/nan_definitions.mk 2009-09-13 22:08:27 UTC (rev
23196)
@@ -138,9 +138,9 @@
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 @@
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 )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
