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 /source/nan_link.mk | |
| 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).
Diffstat (limited to 'source/nan_link.mk')
| -rw-r--r-- | source/nan_link.mk | 11 |
1 files changed, 4 insertions, 7 deletions
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 |