From 1f48888099322bdec68f7bd10c3c370a42f48744 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 8 May 2005 14:38:35 +0000 Subject: MinGW compilation fix by Erik Lunchpail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15368 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/netstream/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'TOOLS/netstream/Makefile') diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index fb33908567..bafad47fe6 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -16,11 +16,9 @@ all: netstream $(CC) -c $(CFLAGS) -o $@ $< -netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o # FIXME: linking is a mess that should be fixed properly some day # it does not work with either GUI, live.com or libavformat enabled - $(CC) $(CFLAGS) netstream.o -o netstream \ - $(MPROOT)/libmpdemux/libmpdemux.a \ +DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \ $(MPROOT)/libmpdvdkit2/libmpdvdkit.a \ $(MPROOT)/libmpcodecs/native/minilzo.o \ $(MPROOT)/libvo/aclib.o $(MPROOT)/libmpcodecs/img_format.o \ @@ -31,6 +29,14 @@ netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o $(VORBIS_LIB) $(CDPARANOIA_LIB) $(Z_LIB) $(GIF_LIB) \ $(SMBSUPPORT_LIB) $(LIVE_LIBS) $(ARCH_LIB) $(COMMON_LIBS) -lm +ifeq ($(TARGET_WIN32),yes) +DEPS += $(MPROOT)/osdep/glob-win.o $(WIN32_LIB) -lwsock32 +endif + +netstream: $(MPROOT)/libmpdemux/libmpdemux.a netstream.o + + $(CC) $(CFLAGS) netstream.o -o netstream $(DEPS) + clean: rm -f *.o *.a *~ -- cgit v1.2.3