[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12115] trunk/blender/source/ nan_definitions.mk: == Sequencer / FFMPEG ==
Peter Schlaile
peter at schlaile.de
Sun Sep 23 16:02:25 CEST 2007
Revision: 12115
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12115
Author: schlaile
Date: 2007-09-23 16:02:25 +0200 (Sun, 23 Sep 2007)
Log Message:
-----------
== Sequencer / FFMPEG ==
Updated FFMPEG to latest version. (And fixed some Tab-codes, that Emacs
didn't like in OPENEXR-related lines)
Modified Paths:
--------------
trunk/blender/source/nan_definitions.mk
Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk 2007-09-23 14:00:48 UTC (rev 12114)
+++ trunk/blender/source/nan_definitions.mk 2007-09-23 14:02:25 UTC (rev 12115)
@@ -102,7 +102,7 @@
else
export NAN_FTGL ?= $(LCGDIR)/ftgl
export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg
- export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavcodec.a
+ export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a $(NAN_FFMPEG)/lib/libavutil.a
export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
endif
@@ -136,9 +136,9 @@
else
ifeq ($(OS),linux)
ifeq ($(WITH_OPENEXR), true)
- NAN_OPENEXR?=$(shell pkg-config --variable=prefix OpenEXR )
- NAN_OPENEXR_INC?=$(shell pkg-config --cflags OpenEXR )
- NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs OpenEXR | sed -s "s/-l//g" )))
+ NAN_OPENEXR?=$(shell pkg-config --variable=prefix OpenEXR )
+ NAN_OPENEXR_INC?=$(shell pkg-config --cflags OpenEXR )
+ NAN_OPENEXR_LIBS?=$(addprefix ${NAN_OPENEXR}/lib/lib,$(addsuffix .a,$(shell pkg-config --libs OpenEXR | sed -s "s/-l//g" )))
endif
else
export NAN_OPENEXR ?= /usr/local
@@ -146,7 +146,7 @@
endif
endif
ifeq ($(WITH_OPENEXR), true)
- export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
+ export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR
endif
endif
@@ -380,7 +380,7 @@
ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
export NAN_FFMPEG ?= /usr
- export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -ldts -lz
+ export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -lswscale -ldts -lz
export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
endif
More information about the Bf-blender-cvs
mailing list