diff options
| author | Chris Want <cwant@ualberta.ca> | 2006-02-06 09:22:39 +0300 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2006-02-06 09:22:39 +0300 |
| commit | b8988d8c1966ccbc288fae15364de9097a03f695 (patch) | |
| tree | 05c48cbef3651c1ded99f2fae06df36676b36da0 | |
| parent | 7263b0f6df0a8dae691427a5dadb931f5ca95c0b (diff) | |
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).
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/src/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 6 | ||||
| -rw-r--r-- | source/nan_link.mk | 11 |
5 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 2605541b942..fdfcef53954 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/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) diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile index 4efba0cd988..19040abd5f6 100644 --- a/source/blender/imbuf/intern/Makefile +++ b/source/blender/imbuf/intern/Makefile @@ -76,5 +76,6 @@ endif ifeq ($(WITH_FFMPEG), true) CPPFLAGS += -DWITH_FFMPEG + CPPFLAGS += $(NAN_FFMPEGCFLAGS) endif diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index a037beb015f..dc7acc3d0d2 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -113,6 +113,7 @@ endif ifeq ($(WITH_FFMPEG),true) CPPFLAGS += -DWITH_FFMPEG + CPPFLAGS += $(NAN_FFMPEGCFLAGS) endif ifeq ($(WITH_OPENEXR),true) diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index b8832cbb823..16e288cc1b8 100644 --- a/source/nan_definitions.mk +++ b/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... 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 |