Author: hyc Date: Sat Nov 7 09:23:23 2009 New Revision: 31 Log: flvstreamer 1.9 changes, all-purpose Makefile. Please stop sending platform-specific Makefiles. Modified: ChangeLog Makefile Modified: ChangeLog ============================================================================== --- ChangeLog Sat Nov 7 08:56:32 2009 (r30) +++ ChangeLog Sat Nov 7 09:23:23 2009 (r31) @@ -1,6 +1,15 @@ RTMPDump Copyright 2008-2009 Andrej Stepanchuk; Distributed under the GPL v2 Copyright 2009 Howard Chu +Copyright 2009 The Flvstreamer Team + +5 November 2009, v1.9 +- Handle more signals to reduce risk of unresumable/corrupted partially streamed files +- Fixed >2GB file handling +- Added --hashes option for a hash progress bar instead of byte counter +- Fix to allow win32 to use binary mode on stdout. +- New MakefileOSX which will create universal binaries for Mac (intel and PPC) +- Added Win32 and cygwin Makefiles 1 November 2009, v1.7 Modified: Makefile ============================================================================== --- Makefile Sat Nov 7 08:56:32 2009 (r30) +++ Makefile Sat Nov 7 09:23:23 2009 (r31) @@ -1,24 +1,40 @@ -#CROSS_COMPILE=arm-angstrom-linux-gnueabi- -#CROSS_COMPILE=mingw32- CC=$(CROSS_COMPILE)gcc CXX=$(CROSS_COMPILE)g++ LD=$(CROSS_COMPILE)ld -#STAGING=/OE/tmp/staging/armv7a-angstrom-linux-gnueabi -#INC=-I$(STAGING)/usr/include OPT=-O2 -CFLAGS=-Wall $(INC) $(OPT) -CXXFLAGS=-Wall $(INC) $(OPT) -LDFLAGS=-Wall -#LIBS=-lws2_32 -lwinmm -lcrypto -lgdi32 +CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT) +CXXFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT) +LDFLAGS=-Wall $(XLDFLAGS) LIBS=-lcrypto THREADLIB=-lpthread SLIBS=$(THREADLIB) $(LIBS) -#EXT=.exe EXT= -all: rtmpdump +all: + @echo 'use "make linux" for a native Linux build, or' + @echo ' "make osx" for a native OSX build, or' + @echo ' "make mingw" for a MinGW32 build, or' + @echo ' "make cygwin" for a CygWin build, or' + @echo ' "make arm" for a cross-compiled Linux ARM build' + +progs: rtmpdump streams + +linux: + @$(MAKE) $(MAKEFLAGS) progs + +osx: + @$(MAKE) XCFLAGS="-arch ppc -arch i386" $(MAKEFLAGS) progs + +mingw: + @$(MAKE) CROSS_COMPILE=mingw32- LIBS="-lws2_32 -lwinmm -lcrypto -lgdi32" THREADLIB= EXT=.exe $(MAKEFLAGS) progs + +cygwin: + @$(MAKE) XCFLAGS=-static XLDFLAGS="-static-libgcc -static" EXT=.exe $(MAKEFLAGS) progs + +arm: + @$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs clean: rm -f *.o