Using NAN_FFMPEG_CFLAGS to find the right headers, and making linking
authorChris Want <cwant@ualberta.ca>
Mon, 6 Feb 2006 06:22:39 +0000 (06:22 +0000)
committerChris Want <cwant@ualberta.ca>
Mon, 6 Feb 2006 06:22:39 +0000 (06:22 +0000)
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
source/blender/imbuf/intern/Makefile
source/blender/src/Makefile
source/nan_definitions.mk
source/nan_link.mk

index 2605541b942329c9c098779573321cdfc0128ad8..fdfcef53954b627d087c0f703004fbb67587eea2 100644 (file)
@@ -86,6 +86,7 @@ endif
 
 ifeq ($(WITH_FFMPEG),true)
     CPPFLAGS += -DWITH_FFMPEG
+    CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
 
 ifeq ($(WITH_OPENEXR), true)
index 4efba0cd988f5cfaeb2c2db335a4f6db9f7af43b..19040abd5f63e0b8b72eb22cefd05a1331658245 100644 (file)
@@ -76,5 +76,6 @@ endif
 
 ifeq ($(WITH_FFMPEG), true)
    CPPFLAGS += -DWITH_FFMPEG
+   CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
 
index a037beb015fd1030c6c6edb8a03118abd9e2da1a..dc7acc3d0d27e29136d918734c84f29f63793bca 100644 (file)
@@ -113,6 +113,7 @@ endif
 
 ifeq ($(WITH_FFMPEG),true)
         CPPFLAGS += -DWITH_FFMPEG
+        CPPFLAGS += $(NAN_FFMPEGCFLAGS)
 endif
 
 ifeq ($(WITH_OPENEXR),true)
index b8832cbb82328c88a2941ba7f4b095eb3f5be742..16e288cc1b8c4b779fff5056cea0e81b118bd8a9 100644 (file)
@@ -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...
index 40d146e42466946dd03dae77c979ba000869b10d..f201077d4c825dac379bb6795ad0e52cb6459eff 100644 (file)
@@ -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