# HG changeset patch # User mmu_man # Date 1044544179 0 # Node ID 821a7facb3e432e614098f4e65d6a2271ff79ab3 # Parent 01d48dc59daba4444ce8da83f676e4a4cba2300c Fix against C integrists breaks :P (hope I didn't break anything else) diff -r 01d48dc59dab -r 821a7facb3e4 Makefile --- a/Makefile Wed Feb 05 01:59:52 2003 +0000 +++ b/Makefile Thu Feb 06 15:09:39 2003 +0000 @@ -9,6 +9,7 @@ CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE OBJS= utils.o cutils.o allformats.o +PPOBJS= # mux and demuxes OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o \ @@ -42,12 +43,12 @@ endif ifeq ($(CONFIG_AUDIO_BEOS),yes) -OBJS+= beosaudio.o +PPOBJS+= beosaudio.o endif ifeq ($(CONFIG_NETWORK),yes) OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o -# BeOS network stuff +# BeOS and Darwin network stuff ifeq ($(NEED_INET_ATON),yes) OBJS+= barpainet.o endif @@ -59,13 +60,13 @@ LIB= $(LIBPREF)avformat$(LIBSUF) -SRCS := $(OBJS:.o=.c) +SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) all: $(LIB) -$(LIB): $(OBJS) +$(LIB): $(OBJS) $(PPOBJS) rm -f $@ - $(AR) rc $@ $(OBJS) + $(AR) rc $@ $(OBJS) $(PPOBJS) ifneq ($(CONFIG_OS2),yes) $(RANLIB) $@ endif