Changeset 3629 for libpipi


Ignore:
Timestamp:
Aug 5, 2009, 4:10:02 PM (11 years ago)
Author:
Sam Hocevar
Message:

Update the Linux build, following the makemovie code merge.

Location:
libpipi/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/ThePimp

    • Property svn:ignore
      •  

        old new  
        1313share
        1414obj
         15pimp
  • libpipi/trunk/examples

    • Property svn:ignore
      •  

        old new  
        99histogram
        1010img2rubik
         11img2twit
        1112line
         13makemovie
        1214sharpen
         15storyboard
        1316*.exe
        1417*.vcproj.*.user
  • libpipi/trunk/examples/Makefile.am

    r3589 r3629  
    44
    55noinst_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram \
    6         colorstring $(makemovie) $(storyboard) $(img2twit)
     6        colorstring makemovie $(storyboard) $(img2twit)
    77
    88edd_SOURCES = edd.c
     
    3030colorstring_LDADD = ../pipi/libpipi.la
    3131
     32makemovie_SOURCES = makemovie.c
     33makemovie_LDADD = ../pipi/libpipi.la
     34
    3235if USE_FFMPEG
    33 makemovie = makemovie
    3436storyboard = storyboard
    3537endif
    36 
    37 makemovie_SOURCES = makemovie.c
    38 makemovie_LDADD = ../pipi/libpipi.la
    39 makemovie_CFLAGS = $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
    40 makemovie_LDFLAGS = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS) $(LIBSWSCALE_LIBS)
    4138
    4239storyboard_SOURCES = storyboard.c
  • libpipi/trunk/pipi/Makefile.am

    r3627 r3629  
    134134endif
    135135
     136if USE_FFMPEG
     137codec_cflags += $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
     138codec_libs += $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS) $(LIBSWSCALE_LIBS)
     139endif
     140
Note: See TracChangeset for help on using the changeset viewer.