Added NAN_NO_FFMPEG user option
authorPeter Schlaile <peter@schlaile.de>
Mon, 6 Feb 2006 00:10:43 +0000 (00:10 +0000)
committerPeter Schlaile <peter@schlaile.de>
Mon, 6 Feb 2006 00:10:43 +0000 (00:10 +0000)
source/nan_definitions.mk
source/nan_link.mk

index 972fdedff19e6945316769f71dcc412fe8d8bc3a..88b44f1bb9a63245e52825b8e5c269c8057b3486 100644 (file)
@@ -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)
 
index 38d60d01f13931d69286d5cce1decc8208afcd34..15893f91e534556dac5d0f81f140c8d817a8c5d5 100644 (file)
@@ -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