diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-02-06 03:10:43 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-02-06 03:10:43 +0300 |
| commit | bec1ab6f774e14de65b8b09631a61a233ea6e052 (patch) | |
| tree | b4c3ebf07b71c69252113c532f185c1434f31a6c | |
| parent | 241352104fe754a2ddc519e4d6109fb3fd07e9bb (diff) | |
Added NAN_NO_FFMPEG user option
| -rw-r--r-- | source/nan_definitions.mk | 4 | ||||
| -rw-r--r-- | source/nan_link.mk | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 972fdedff19..88b44f1bb9a 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -343,7 +343,9 @@ endif export WITH_FREETYPE2 ?= true # enable ffmpeg support - export WITH_FFMPEG ?= true + ifndef NAN_NO_FFMPEG + export WITH_FFMPEG ?= true + endif else ifeq ($(OS),openbsd) diff --git a/source/nan_link.mk b/source/nan_link.mk index 38d60d01f13..15893f91e53 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -100,7 +100,10 @@ ifeq ($(OS),linux) ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64")) COMMENT = "MESA 3.1" LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi - LLIBS += -lutil -lc -lm -ldl -lpthread -lavformat -lavcodec -lavutil -ldts -lz + LLIBS += -lutil -lc -lm -ldl -lpthread + ifeq ($(WITH_FFMPEG),true) + LLIBS += -lavformat -lavcodec -lavutil -ldts -lz + endif # LLIBS += -L$(NAN_ODE)/lib -lode LOPTS = -export-dynamic DADD = -lGL -lGLU |