From 04ae23afff60d00822cc96764b5c2b5175d59698 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Wed, 13 Oct 2010 16:38:24 +0200 Subject: [PATCH] Added MingW32 rtmp target; changed Watcom targets. Modified Watcom targets to avoid backslashs so that they can work on Linux too. --- Makefile.dist | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile.dist b/Makefile.dist index 1ad2c6649..29f13af1d 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -55,22 +55,16 @@ borland-clean: make -f Makefile.b32 clean watcom: .SYMBOLIC - cd lib - wmake -u -f Makefile.Watcom - cd ..\src - wmake -u -f Makefile.Watcom + cd lib && $(MAKE) -u -f Makefile.Watcom + cd src && $(MAKE) -u -f Makefile.Watcom watcom-clean: .SYMBOLIC - cd lib - wmake -u -f Makefile.Watcom clean - cd ..\src - wmake -u -f Makefile.Watcom clean + cd lib && $(MAKE) -u -f Makefile.Watcom clean + cd src && $(MAKE) -u -f Makefile.Watcom clean watcom-vclean: .SYMBOLIC - cd lib - wmake -u -f Makefile.Watcom vclean - cd ..\src - wmake -u -f Makefile.Watcom vclean + cd lib && $(MAKE) -u -f Makefile.Watcom vclean + cd src && $(MAKE) -u -f Makefile.Watcom vclean mingw32: $(MAKE) -C lib -f Makefile.m32 @@ -92,6 +86,10 @@ mingw32-ssh2-ssl-sspi-zlib: $(MAKE) -C lib -f Makefile.m32 SSH2=1 SSL=1 SSPI=1 ZLIB=1 $(MAKE) -C src -f Makefile.m32 SSH2=1 SSL=1 SSPI=1 ZLIB=1 +mingw32-rtmp-ssh2-ssl-sspi-zlib: + $(MAKE) -C lib -f Makefile.m32 RTMP=1 SSH2=1 SSL=1 SSPI=1 ZLIB=1 + $(MAKE) -C src -f Makefile.m32 RTMP=1 SSH2=1 SSL=1 SSPI=1 ZLIB=1 + mingw32-clean: $(MAKE) -C lib -f Makefile.m32 clean $(MAKE) -C src -f Makefile.m32 clean