diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-06-26 13:18:30 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-06-26 13:18:30 +0400 |
| commit | f0604cffb7c14afbe69ce2d05134647c7878e83b (patch) | |
| tree | 2c88cf42d51ae85d6690fe94b5236cd07d837be5 /source/nan_definitions.mk | |
| parent | 098c73f441876be113781a7775c5f1248a0f5eb2 (diff) | |
== FFMPEG ==
Made internal ffmpeg-libraries link by explicitly specifying the archive-files.
(Thanks GSR for pointing this out)
Otherwise, blender always links to the system-libs.
Diffstat (limited to 'source/nan_definitions.mk')
| -rw-r--r-- | source/nan_definitions.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 6e96b48c19d..1a381fdefe5 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -90,12 +90,12 @@ endif ifeq ($(FREE_WINDOWS), true) export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg - export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavutil -lavcodec + export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavcodec.a export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include else export NAN_FTGL ?= $(LCGDIR)/ftgl export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg - export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavutil -lavcodec + export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavcodec.a export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include endif |