forked from bartvdbraak/blender
Prepare for removal of FFMPEG from extern.
make clean and full rebuild recommended.
This commit is contained in:
parent
7e7a6a193e
commit
a4532b202b
9
extern/Makefile
vendored
9
extern/Makefile
vendored
@ -32,15 +32,6 @@ SOURCEDIR = extern
|
|||||||
DIR = $(OCGDIR)/extern
|
DIR = $(OCGDIR)/extern
|
||||||
DIRS = glew/src
|
DIRS = glew/src
|
||||||
|
|
||||||
ifeq ($(WITH_FFMPEG), true)
|
|
||||||
ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
|
|
||||||
DIRS += ffmpeg
|
|
||||||
endif
|
|
||||||
ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
|
|
||||||
DIRS += ffmpeg
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Cloth requires it
|
# Cloth requires it
|
||||||
#ifneq ($(NAN_NO_KETSJI), true)
|
#ifneq ($(NAN_NO_KETSJI), true)
|
||||||
DIRS += bullet2
|
DIRS += bullet2
|
||||||
|
@ -138,9 +138,9 @@ ifndef CONFIG_GUESS
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
|
ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
|
||||||
export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)
|
export NAN_FFMPEG = $(shell pkg-config --variable=prefix libavcodec) # Assume they are all in the same prefix
|
||||||
export NAN_FFMPEGLIBS ?= $(shell ffmpeg-config --libs avformat avcodec)
|
export NAN_FFMPEGLIBS = $(shell pkg-config --libs libavcodec libavdevice libavformat libswscale libavutil)
|
||||||
export NAN_FFMPEGCFLAGS ?= $(shell ffmpeg-config --cflags)
|
export NAN_FFMPEGCFLAGS = $(shell pkg-config --cflags libavcodec libavdevice libavformat libswscale libavutil)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Platform Dependent settings go below:
|
# Platform Dependent settings go below:
|
||||||
@ -336,12 +336,6 @@ ifndef CONFIG_GUESS
|
|||||||
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
|
export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
|
||||||
export NAN_SAMPLERATE ?= /usr
|
export NAN_SAMPLERATE ?= /usr
|
||||||
|
|
||||||
ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
|
|
||||||
export NAN_FFMPEG ?= /usr
|
|
||||||
export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -lswscale -lavdevice -ldts -lz
|
|
||||||
export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(WITH_OPENEXR), true)
|
ifeq ($(WITH_OPENEXR), true)
|
||||||
export NAN_OPENEXR ?= $(shell pkg-config --variable=prefix OpenEXR )
|
export NAN_OPENEXR ?= $(shell pkg-config --variable=prefix OpenEXR )
|
||||||
export NAN_OPENEXR_INC ?= $(shell pkg-config --cflags OpenEXR )
|
export NAN_OPENEXR_INC ?= $(shell pkg-config --cflags OpenEXR )
|
||||||
|
Loading…
Reference in New Issue
Block a user