Prepare for removal of FFMPEG from extern.

make clean and full rebuild recommended.

diff --git a/extern/Makefile b/extern/Makefile
index 1bebf1e1994d1d535ef4ef4b9b724160b7ea1ea0..b81fbd2b91ab4d40165a3c9899b9e691e26795fc 100644 (file)
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -32,15 +32,6 @@ SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
 DIRS = glew/src
 
 DIR = $(OCGDIR)/extern
 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
 #ifneq ($(NAN_NO_KETSJI), true)
 DIRS += bullet2
 # Cloth requires it
 #ifneq ($(NAN_NO_KETSJI), true)
 DIRS += bullet2

diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index f8afc7f3fa68e52abd71c449c0a952b6f2631e9a..8c47bcf11c1ae7090e9725e0e59dfafe8926e7f9 100644 (file)
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -138,9 +138,9 @@ ifndef CONFIG_GUESS
   endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
   endif
 
   ifeq ($(NAN_USE_FFMPEG_CONFIG), true)

-    export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)
-    export NAN_FFMPEGLIBS ?= $(shell ffmpeg-config --libs avformat avcodec)
-    export NAN_FFMPEGCFLAGS ?= $(shell ffmpeg-config --cflags)
+    export NAN_FFMPEG = $(shell pkg-config --variable=prefix libavcodec) # Assume they are all in the same prefix
+    export NAN_FFMPEGLIBS = $(shell pkg-config --libs libavcodec libavdevice libavformat libswscale libavutil)
+    export NAN_FFMPEGCFLAGS = $(shell pkg-config --cflags libavcodec libavdevice libavformat libswscale libavutil)

   endif
 
   # Platform Dependent settings go below:
   endif
 
   # Platform Dependent settings go below:


@@ -336,12 +336,6 @@ ifndef CONFIG_GUESS
     export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
     export NAN_SAMPLERATE ?= /usr
 
     export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
     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)
       export NAN_OPENEXR ?= $(shell pkg-config --variable=prefix OpenEXR )
       export NAN_OPENEXR_INC ?= $(shell pkg-config --cflags OpenEXR )
     ifeq ($(WITH_OPENEXR), true)
       export NAN_OPENEXR ?= $(shell pkg-config --variable=prefix OpenEXR )
       export NAN_OPENEXR_INC ?= $(shell pkg-config --cflags OpenEXR )