diff options
author | Chris Want <cwant@ualberta.ca> | 2006-02-06 04:49:33 +0300 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2006-02-06 04:49:33 +0300 |
commit | cd4a6b669b3071c5b0f2b6d81843a5b21dffc106 (patch) | |
tree | f95b34bfab4c3150d0b9941db5e1ecd59831cc95 /source/nan_link.mk | |
parent | f4d5d9080d42573d04e178c73fae80a7a33378fd (diff) |
To aid linking, I added NAN_USE_FFMPEG_CONFIG (true/false).
If "export NAN_USE_FFMPEG_CONFIG=true" is added to user-def.mk,
the system executes the ffmeg-config program to set values
for NAN_FFMPEG (--prefix), NAN_FFMPEGLIBS (--libs avcodec avformat),
and NAN_FFMPEGCFLAGS (--cflags). Only one used so far is the
NAN_FFMPEGLIBS for linking on linux (if requested to do so).
Current default is not to do this.
Diffstat (limited to 'source/nan_link.mk')
-rw-r--r-- | source/nan_link.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/nan_link.mk b/source/nan_link.mk index 15893f91e53..e1910336e5a 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -102,7 +102,11 @@ ifeq ($(OS),linux) LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi LLIBS += -lutil -lc -lm -ldl -lpthread ifeq ($(WITH_FFMPEG),true) - LLIBS += -lavformat -lavcodec -lavutil -ldts -lz + ifeq ($(NAN_USE_FFMPEG_CONFIG), true) + LLIBS += $(NAN_FFMPEGLIBS) + else + LLIBS += -lavformat -lavcodec -lavutil -ldts -lz + endif endif # LLIBS += -L$(NAN_ODE)/lib -lode LOPTS = -export-dynamic |