Using NAN_FFMPEG_CFLAGS to find the right headers, and making linking

with NAN_FFMPEG_LIBS more general (i.e., not just for linux, and
moving some of the linux linking stuff to source/nan_definitions.mk).

source/blender/blenkernel/intern/Makefile

@@ -86,6 +86,7 @@ endif
 
 ifeq ($(WITH_FFMPEG),true)
     CPPFLAGS += -DWITH_FFMPEG
+    CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
 
 ifeq ($(WITH_OPENEXR), true)

source/blender/imbuf/intern/Makefile

@@ -76,5 +76,6 @@ endif
 
 ifeq ($(WITH_FFMPEG), true)
    CPPFLAGS += -DWITH_FFMPEG
+   CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
 

source/blender/src/Makefile

@@ -113,6 +113,7 @@ endif
 
 ifeq ($(WITH_FFMPEG),true)
         CPPFLAGS += -DWITH_FFMPEG
+        CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
 
 ifeq ($(WITH_OPENEXR),true)

source/nan_definitions.mk

@@ -330,6 +330,12 @@ endif
     export NAN_SDLLIBS ?= $(shell sdl-config --libs)
     export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
 
+ifneq ($(NAN_USE_FFMPEG_CONFIG), true)
+    export NAN_FFMPEG ?= /usr
+    export NAN_FFMPEGLIBS ?= -L$(NAN_FFMPEG)/lib -lavformat -lavcodec -lavutil -ldts -lz
+    export NAN_FFMPEGCFLAGS ?= -I$(NAN_FFMPEG)/include
+endif
+
     # Uncomment the following line to use Mozilla inplace of netscape
     export CPPFLAGS += -DMOZ_NOT_NET
     # Location of MOZILLA/Netscape header files...

source/nan_link.mk

@@ -101,13 +101,6 @@ ifeq ($(OS),linux)
     COMMENT = "MESA 3.1"
     LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread 
-    ifeq ($(WITH_FFMPEG),true)
-      ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
-        LLIBS += $(NAN_FFMPEGLIBS)
-      else
-        LLIBS += -lavformat -lavcodec -lavutil -ldts -lz
-      endif
-    endif
 #    LLIBS += -L$(NAN_ODE)/lib -lode
     LOPTS = -export-dynamic
     DADD = -lGL -lGLU
@@ -164,3 +157,7 @@ endif
 ifneq ($(OS), irix)
    LLIBS += $(NAN_SDLLIBS)
 endif
+
+ifeq ($(WITH_FFMPEG),true)
+   LLIBS += $(NAN_FFMPEGLIBS)
+endif