sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added NAN_NO_FFMPEG user option

Browse Source
This commit is contained in:
Peter Schlaile 2006-02-06 00:10:43 +00:00
parent 241352104f
commit bec1ab6f77
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/nan_definitions.mk
View 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)

5
source/nan_link.mk
View 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