Changeset 920 for trunk/mk


Ignore:
Timestamp:
Sep 25, 2006, 6:37:45 PM (16 years ago)
Author:
joshe
Message:

Merge nat-traversal branch to trunk.

Location:
trunk/mk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mk/common.mk

    r912 r920  
    11# $Id$
    22
    3 TMPCFLAGS   = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
     3TMPCFLAGS   = -g -Wall -W -D_FILE_OFFSET_BITS=64 \
    44              -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
    55              -DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
  • trunk/mk/lib.mk

    r265 r920  
    66SRCS = transmission.c bencode.c net.c tracker.c peer.c inout.c \
    77       metainfo.c sha1.c utils.c fdlimit.c clients.c completion.c \
    8        platform.c ratecontrol.c choking.c
     8       platform.c ratecontrol.c choking.c natpmp.c upnp.c http.c xml.c
    99OBJS = $(SRCS:%.c=%.o)
    1010
Note: See TracChangeset for help on using the changeset viewer.