Author: hyc Date: Mon Jul 12 10:20:04 2010 New Revision: 546 Log: MacOSX/Darwin shared library flags Modified: trunk/Makefile trunk/README trunk/librtmp/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Jul 8 13:11:47 2010 (r545) +++ trunk/Makefile Mon Jul 12 10:20:04 2010 (r546) @@ -33,10 +33,12 @@ SBINDIR=$(DESTDIR)$(sbindir) MANDIR=$(DESTDIR)$(mandir) LIBS_posix= +LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) THREADLIB_posix=-lpthread +THREADLIB_darwin=-lpthread THREADLIB_mingw= THREADLIB=$(THREADLIB_$(SYS)) SLIBS=$(THREADLIB) $(LIBS) @@ -45,6 +47,7 @@ LIBRTMP=librtmp/librtmp.a INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h EXT_posix= +EXT_darwin= EXT_mingw=.exe EXT=$(EXT_$(SYS)) Modified: trunk/README ============================================================================== --- trunk/README Thu Jul 8 13:11:47 2010 (r545) +++ trunk/README Mon Jul 12 10:20:04 2010 (r546) @@ -10,7 +10,11 @@ To compile type "make" with SYS=<platfor $ make SYS=posix -for Linux, MacOSX, Unix, etc. or +for Linux, Unix, etc. or + + $ make SYS=darwin + +for MacOSX or $ make SYS=mingw Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Thu Jul 8 13:11:47 2010 (r545) +++ trunk/librtmp/Makefile Mon Jul 12 10:20:04 2010 (r546) @@ -17,6 +17,7 @@ REQ_GNUTLS=gnutls REQ_OPENSSL=libssl,libcrypto LIBZ=-lz LIBS_posix= +LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) LIB_OPENSSL=-lssl -lcrypto $(LIBZ) @@ -26,9 +27,16 @@ CRYPTO_REQ=$(REQ_$(CRYPTO)) CRYPTO_DEF=$(DEF_$(CRYPTO)) SO_posix=so.0 +SO_darwin=so.0 SO_mingw=dll SO_EXT=$(SO_$(SYS)) +SO_LDFLAGS_posix=-shared -Wl,-soname,$@ +SO_LDFLAGS_darwin=-bundle -flat_namespace -undefined suppress -fno-common \ + -headerpad_max_install_names +SO_LDFLAGS_mingw= +SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) + SHARED=yes SODEF_yes=-fPIC SOLIB_yes=librtmp.$(SO_EXT) @@ -40,6 +48,7 @@ SO_INST=$(SOINST_$(SHARED)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) +LDFLAGS=$(XLDFLAGS) incdir=$(prefix)/include/librtmp bindir=$(prefix)/bin @@ -61,7 +70,7 @@ librtmp.a: $(OBJS) $(AR) rs $@ $? librtmp.$(SO_EXT): $(OBJS) - $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) + $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) ln -sf $@ librtmp.so log.o: log.c log.h Makefile