Ignore:
Timestamp:
Aug 31, 2010 8:25:36 PM (14 years ago)
Author:
gah
Message:

re-merge with latest trunk changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/blt4/lang/tcl/src/Makefile.in

    r1643 r1897  
    2525CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    2626LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    27 CFLAGS          = @CFLAGS@
    28 TCL_VERSION     = @TCL_VERSION@
     27CFLAGS          = @CFLAGS@ -fPIC
     28TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    3030
    … …  
    3535  -I../../../src/core \
    3636  -I$(srcdir)/../../../src/core \
     37  -I$(srcdir)/../../../src/objects \
    3738  -I$(includedir)
    3839version         = @PACKAGE_VERSION@
    … …  
    6869endif
    6970
     71FFMPEG          = @HAVE_FFMPEG_LIBS@
     72ifeq ($(FFMPEG),yes)
     73    OBJS += RpMediaPlayerTclInterface.o
     74    LIBS += -L../../../src/objects -lRpObjects
     75endif
     76
     77
    7078# Not using     RpLibraryTclInterface.o \
    7179
Note: See TracChangeset for help on using the changeset viewer.