From b8988d8c1966ccbc288fae15364de9097a03f695 Mon Sep 17 00:00:00 2001
From: Chris Want <cwant@ualberta.ca>
Date: Mon, 6 Feb 2006 06:22:39 +0000
Subject: 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/nan_link.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'source/nan_link.mk')

diff --git a/source/nan_link.mk b/source/nan_link.mk
index 40d146e4246..f201077d4c8 100644
--- a/source/nan_link.mk
+++ b/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
-- 
cgit v1.2.3