From eae86b6ff2d11421e4839ffbe79c4c547d15751a Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Tue, 12 Apr 2005 09:05:20 +0000 Subject: [PATCH] OS/X Patch from Torsten Spindler git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@694 d19143bc-622f-0410-bfdd-b5b2a6649095 --- configure | 37 ++++++++++++++++++++++++++++++--- setenv | 2 + src/albino/Makefile | 2 +- src/albino/albino.c | 2 + src/framework/Makefile | 8 +++--- src/humperdink/Makefile | 4 +- src/humperdink/io.c | 1 + src/inigo/Makefile | 4 +- src/inigo/inigo.c | 2 + src/inigo/io.c | 1 + src/miracle/Makefile | 14 ++++++------ src/miracle/miracle.c | 2 + src/modules/avformat/Makefile | 12 +++++----- src/modules/avformat/configure | 25 ++++++++++++++++++---- src/modules/core/Makefile | 4 +- src/modules/core/configure | 42 +++++++++++++++++++------------------- src/modules/dv/Makefile | 4 +- src/modules/dv/configure | 4 +- src/modules/fezzik/Makefile | 4 +- src/modules/fezzik/configure | 4 +- src/modules/gtk2/Makefile | 4 +- src/modules/gtk2/configure | 8 +++--- src/modules/inigo/Makefile | 4 +- src/modules/inigo/configure | 4 +- src/modules/jackrack/Makefile | 4 +- src/modules/jackrack/configure | 2 +- src/modules/normalize/Makefile | 4 +- src/modules/normalize/configure | 2 +- src/modules/plus/Makefile | 4 +- src/modules/plus/configure | 10 ++++---- src/modules/resample/Makefile | 4 +- src/modules/resample/configure | 2 +- src/modules/sdl/Makefile | 4 +- src/modules/sdl/configure | 6 ++-- src/modules/sox/Makefile | 4 +- src/modules/sox/configure | 2 +- src/modules/valerie/Makefile | 4 +- src/modules/valerie/configure | 2 +- src/modules/vorbis/Makefile | 4 +- src/modules/vorbis/configure | 2 +- src/modules/westley/Makefile | 4 +- src/modules/westley/configure | 6 ++-- src/modules/xine/Makefile | 4 +- src/modules/xine/configure | 2 +- src/tests/Makefile | 6 ++-- src/valerie/Makefile | 10 ++++---- src/valerie/valerie_socket.c | 1 + 47 files changed, 173 insertions(+), 118 deletions(-) diff --git a/configure b/configure index e198581..59508f7 100755 --- a/configure +++ b/configure @@ -51,11 +51,24 @@ function build_config echo "TARGETARCH=-march=$cpu" && echo "TARGETCPU=-mcpu=$cpu" - [ "`uname`" = "Linux" ] && - echo "LIBDL=-ldl" - echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer" - echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread" + echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)" + + case $targetos in + Darwin) + echo "CFLAGS+=-DDARWIN" + echo "SHFLAGS=-dynamiclib" + ;; + Linux) + echo "CFLAGS+=-pthread" + echo "SHFLAGS=-shared" + echo "LIBDL=-ldl" + echo "RDYNAMIC=-rdynamic" + ;; + *) + ;; + esac + echo "LIBSUF=$LIBSUF" ) > config.mak echo "#!/bin/sh" > mlt-config @@ -98,6 +111,22 @@ export mmx=true export gpl=false export cpu= +# Determine OS +targetos=$(uname -s) +# Chose appropriate suffix for libraries +case $targetos in + Darwin) + LIBSUF=".dylib" + ;; + Linux) + LIBSUF=".so" + ;; + *) + LIBSUF=".so" + ;; +esac +export LIBSUF + # Iterate through arguments for i in "$@" do diff --git a/setenv b/setenv index 41e0ed7..c57b28a 100644 --- a/setenv +++ b/setenv @@ -14,6 +14,8 @@ export LD_LIBRARY_PATH=\ `pwd`/../sr_sdk_release:\ $LD_LIBRARY_PATH +[ $(uname -s) = Darwin ] && export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH + export PATH=\ `pwd`/src/albino:\ `pwd`/src/inigo:\ diff --git a/src/albino/Makefile b/src/albino/Makefile index 05daf22..7b56778 100644 --- a/src/albino/Makefile +++ b/src/albino/Makefile @@ -4,7 +4,7 @@ TARGET = albino OBJS = albino.o -CFLAGS += -I.. -rdynamic +CFLAGS += -I.. $(RDYNAMIC) LDFLAGS += -L../miracle -lmiracle -L../valerie -lvalerie -L../miracle -lmiracle -L../framework -lmlt diff --git a/src/albino/albino.c b/src/albino/albino.c index 9a65e29..60667f3 100644 --- a/src/albino/albino.c +++ b/src/albino/albino.c @@ -64,7 +64,9 @@ int main( int argc, char **argv ) // Use realtime scheduling if possible memset( &scp, '\0', sizeof( scp ) ); scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1; +#ifndef DARWIN sched_setscheduler( 0, SCHED_FIFO, &scp ); +#endif printf( "Miracle Standalone Instance\n" ); parser = miracle_parser_init_local( ); diff --git a/src/framework/Makefile b/src/framework/Makefile index 596d4f5..15479e0 100644 --- a/src/framework/Makefile +++ b/src/framework/Makefile @@ -1,6 +1,6 @@ include ../../config.mak -TARGET = libmlt.so +TARGET = libmlt$(LIBSUF) OBJS = mlt_frame.o \ mlt_geometry.o \ @@ -48,14 +48,14 @@ INCS = mlt_consumer.h \ SRCS := $(OBJS:.o=.c) -CFLAGS += -rdynamic -DPREFIX="\"$(prefix)\"" +CFLAGS += $(RDYNAMIC) -DPREFIX="\"$(prefix)\"" LDFLAGS += -lm $(LIBDL) -lpthread all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend @@ -67,7 +67,7 @@ clean: rm -f $(OBJS) $(TARGET) install: - install -m 755 $(TARGET) $(prefix)/lib/libmlt.so + install -m 755 $(TARGET) $(prefix)/lib/libmlt$(LIBSUF) install -d "$(prefix)/include/mlt/framework" install -m 644 $(INCS) "$(prefix)/include/mlt/framework" diff --git a/src/humperdink/Makefile b/src/humperdink/Makefile index c5d82c6..2f0d4da 100644 --- a/src/humperdink/Makefile +++ b/src/humperdink/Makefile @@ -6,9 +6,9 @@ OBJS = client.o \ io.o \ remote.o -CFLAGS += -I.. -rdynamic +CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L ../valerie -L ../framework -lvalerie -lmlt +LDFLAGS += -L../valerie -L../framework -lvalerie -lmlt SRCS := $(OBJS:.o=.c) diff --git a/src/humperdink/io.c b/src/humperdink/io.c index b9e92f2..90999cc 100644 --- a/src/humperdink/io.c +++ b/src/humperdink/io.c @@ -25,6 +25,7 @@ #include #include #include +#include /* Application header files */ #include "io.h" diff --git a/src/inigo/Makefile b/src/inigo/Makefile index 296de35..57e750e 100644 --- a/src/inigo/Makefile +++ b/src/inigo/Makefile @@ -5,9 +5,9 @@ TARGET = inigo OBJS = inigo.o \ io.o -CFLAGS += -I.. -rdynamic +CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L ../framework -lmlt +LDFLAGS += -L../framework -lmlt SRCS := $(OBJS:.o=.c) diff --git a/src/inigo/inigo.c b/src/inigo/inigo.c index 77575d5..5fbdff6 100644 --- a/src/inigo/inigo.c +++ b/src/inigo/inigo.c @@ -197,7 +197,9 @@ int main( int argc, char **argv ) // Use realtime scheduling if possible memset( &scp, '\0', sizeof( scp ) ); scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1; +#ifndef DARWIN sched_setscheduler( 0, SCHED_FIFO, &scp ); +#endif // Construct the factory mlt_factory_init( NULL ); diff --git a/src/inigo/io.c b/src/inigo/io.c index 44b46ed..271f771 100644 --- a/src/inigo/io.c +++ b/src/inigo/io.c @@ -29,6 +29,7 @@ #include #include #include +#include /* Application header files */ #include "io.h" diff --git a/src/miracle/Makefile b/src/miracle/Makefile index 24ca72a..efb5f00 100644 --- a/src/miracle/Makefile +++ b/src/miracle/Makefile @@ -18,19 +18,19 @@ INCS = miracle_server.h \ OBJS = $(APP_OBJS) $(LIB_OBJS) -CFLAGS += -I.. -rdynamic +CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L ../valerie -lvalerie -L ../framework -lmlt +LDFLAGS += -L../valerie -lvalerie -L../framework -lmlt SRCS := $(OBJS:.o=.c) all: $(TARGET) -$(TARGET): $(APP_OBJS) libmiracle.so +$(TARGET): $(APP_OBJS) libmiracle$(LIBSUF) $(CC) -o $@ $(APP_OBJS) -L. -lmiracle $(LDFLAGS) -libmiracle.so: $(LIB_OBJS) - $(CC) -shared -o $@ $(LIB_OBJS) $(LDFLAGS) +libmiracle$(LIBSUF): $(LIB_OBJS) + $(CC) $(SHFLAGS) -o $@ $(LIB_OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend @@ -39,12 +39,12 @@ dist-clean: clean rm -f .depend clean: - rm -f $(OBJS) $(TARGET) libmiracle.so + rm -f $(OBJS) $(TARGET) libmiracle$(LIBSUF) install: all install -d "$(bindir)" install -c -s -m 755 $(TARGET) "$(bindir)" - install -m 755 libmiracle.so $(prefix)/lib/libmiracle.so + install -m 755 libmiracle$(LIBSUF) $(prefix)/lib/libmiracle$(LIBSUF) mkdir -p "$(prefix)/include/mlt/miracle" install -m 644 $(INCS) "$(prefix)/include/mlt/miracle" diff --git a/src/miracle/miracle.c b/src/miracle/miracle.c index 4f389e6..cdd7f74 100644 --- a/src/miracle/miracle.c +++ b/src/miracle/miracle.c @@ -72,7 +72,9 @@ int main( int argc, char **argv ) // Use realtime scheduling if possible memset( &scp, '\0', sizeof( scp ) ); scp.sched_priority = sched_get_priority_max( SCHED_FIFO ) - 1; +#ifndef DARWIN sched_setscheduler( 0, SCHED_FIFO, &scp ); +#endif mlt_factory_init( NULL ); diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile index 37bf55a..d307bc2 100644 --- a/src/modules/avformat/Makefile +++ b/src/modules/avformat/Makefile @@ -1,7 +1,7 @@ include ../../../config.mak include config.mak -TARGET = ../libmltavformat.so +TARGET = ../libmltavformat$(LIBSUF) OBJS = factory.o \ producer_avformat.o \ @@ -30,10 +30,10 @@ all: $(TARGET) $(TARGET): $(OBJS) if [ $(LOCAL_FFMPEG) ] ; then \ $(MAKE) -C ffmpeg all ; \ - cp -f ffmpeg/libavcodec/libavcodec.so ../../framework/libmltavcodec.so ; \ - cp -f ffmpeg/libavformat/libavformat.so ../../framework/libmltavformat.so ; \ + cp -f ffmpeg/libavcodec/libavcodec$(LIBSUF) ../../framework/libmltavcodec$(LIBSUF) ; \ + cp -f ffmpeg/libavformat/libavformat$(LIBSUF) ../../framework/libmltavformat$(LIBSUF) ; \ fi - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi @@ -50,8 +50,8 @@ clean: install: all install -m 755 $(TARGET) "$(prefix)/share/mlt/modules" if [ $(LOCAL_FFMPEG) ] ; then \ - install -m 755 ../../framework/libmltavcodec.so "$(prefix)/share/mlt/modules" ; \ - install -m 755 ../../framework/libmltavformat.so "$(prefix)/share/mlt/modules" ; \ + install -m 755 ../../framework/libmltavcodec.$(LIBSUF) "$(prefix)/share/mlt/modules" ; \ + install -m 755 ../../framework/libmltavformat.$(LIBSUF) "$(prefix)/share/mlt/modules" ; \ fi ifneq ($(wildcard .depend),) diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure index 722b7f5..b6a94e3 100755 --- a/src/modules/avformat/configure +++ b/src/modules/avformat/configure @@ -1,5 +1,6 @@ #!/bin/sh + if [ "$help" = "1" ] then cat << EOF @@ -13,6 +14,18 @@ FFMPEG/avformat options: EOF else + targetos=$(uname -s) + case $targetos in + Darwin) + export LIBSUF=.dylib + ;; + Linux) + export LIBSUF=.so + ;; + *) + ;; + esac + echo > config.mak export static_ffmpeg= @@ -52,6 +65,8 @@ else then echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec" >> config.mak echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec" >> config.mak + [ $targetos = "Darwin" ] && + echo "LDFLAGS+=-single_module" >> config.mak else echo "avformat: Invalid path specified: $static_ffmpeg" touch ../disable-avformat @@ -73,17 +88,17 @@ else echo "EXTRA_LIBS=$extra_libs" >> config.mak cat << EOF >> ../producers.dat -avformat libmltavformat.so +avformat libmltavformat$LIBSUF EOF cat << EOF >> ../filters.dat -avdeinterlace libmltavformat.so -avresample libmltavformat.so -avcolour_space libmltavformat.so +avdeinterlace libmltavformat$LIBSUF +avresample libmltavformat$LIBSUF +avcolour_space libmltavformat$LIBSUF EOF cat << EOF >> ../consumers.dat -avformat libmltavformat.so +avformat libmltavformat$LIBSUF EOF fi diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile index 7bdf0a2..af4551c 100644 --- a/src/modules/core/Makefile +++ b/src/modules/core/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltcore.so +TARGET = ../libmltcore$(LIBSUF) OBJS = factory.o \ producer_colour.o \ @@ -36,7 +36,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) $(ASM_OBJS) - $(CC) -shared -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) composite_line_yuv_mmx.o: composite_line_yuv_mmx.S $(CC) -o $@ -c composite_line_yuv_mmx.S diff --git a/src/modules/core/configure b/src/modules/core/configure index 7b2e4fe..49ea0d6 100755 --- a/src/modules/core/configure +++ b/src/modules/core/configure @@ -4,36 +4,36 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -colour libmltcore.so -noise libmltcore.so -ppm libmltcore.so +colour libmltcore$LIBSUF +noise libmltcore$LIBSUF +ppm libmltcore$LIBSUF EOF cat << EOF >> ../filters.dat -brightness libmltcore.so -channelcopy libmltcore.so -data_feed libmltcore.so -data_show libmltcore.so -gamma libmltcore.so -greyscale libmltcore.so -luma libmltcore.so -mirror libmltcore.so -obscure libmltcore.so -region libmltcore.so -rescale libmltcore.so -resize libmltcore.so -watermark libmltcore.so +brightness libmltcore$LIBSUF +channelcopy libmltcore$LIBSUF +data_feed libmltcore$LIBSUF +data_show libmltcore$LIBSUF +gamma libmltcore$LIBSUF +greyscale libmltcore$LIBSUF +luma libmltcore$LIBSUF +mirror libmltcore$LIBSUF +obscure libmltcore$LIBSUF +region libmltcore$LIBSUF +rescale libmltcore$LIBSUF +resize libmltcore$LIBSUF +watermark libmltcore$LIBSUF EOF cat << EOF >> ../transitions.dat -composite libmltcore.so -luma libmltcore.so -mix libmltcore.so -region libmltcore.so +composite libmltcore$LIBSUF +luma libmltcore$LIBSUF +mix libmltcore$LIBSUF +region libmltcore$LIBSUF EOF cat << EOF >> ../consumers.dat -null libmltcore.so +null libmltcore$LIBSUF EOF fi diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile index 1edab49..7d92c1e 100644 --- a/src/modules/dv/Makefile +++ b/src/modules/dv/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltdv.so +TARGET = ../libmltdv$(LIBSUF) OBJS = factory.o \ producer_libdv.o \ @@ -17,7 +17,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/dv/configure b/src/modules/dv/configure index 4825f84..fa2b86e 100755 --- a/src/modules/dv/configure +++ b/src/modules/dv/configure @@ -4,11 +4,11 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -libdv libmltdv.so +libdv libmltdv$LIBSUF EOF cat << EOF >> ../consumers.dat -libdv libmltdv.so +libdv libmltdv$LIBSUF EOF fi diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile index 5576085..c64c0f2 100644 --- a/src/modules/fezzik/Makefile +++ b/src/modules/fezzik/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltfezzik.so +TARGET = ../libmltfezzik$(LIBSUF) OBJS = factory.o \ producer_fezzik.o \ @@ -15,7 +15,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/fezzik/configure b/src/modules/fezzik/configure index c56f34c..9d26d18 100755 --- a/src/modules/fezzik/configure +++ b/src/modules/fezzik/configure @@ -4,8 +4,8 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -fezzik libmltfezzik.so -hold libmltfezzik.so +fezzik libmltfezzik$LIBSUF +hold libmltfezzik$LIBSUF EOF fi diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile index 6697e59..b04e00a 100644 --- a/src/modules/gtk2/Makefile +++ b/src/modules/gtk2/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltgtk2.so +TARGET = ../libmltgtk2$(LIBSUF) OBJS = factory.o \ consumer_gtk2.o \ @@ -24,7 +24,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) $(ASM_OBJS) - $(CC) -shared -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) have_mmx.o: $(CC) -o $@ -c have_mmx.S diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure index 58000a9..a4d0e49 100755 --- a/src/modules/gtk2/configure +++ b/src/modules/gtk2/configure @@ -4,16 +4,16 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -pixbuf libmltgtk2.so -pango libmltgtk2.so +pixbuf libmltgtk2$LIBSUF +pango libmltgtk2$LIBSUF EOF cat << EOF >> ../filters.dat -gtkrescale libmltgtk2.so +gtkrescale libmltgtk2$LIBSUF EOF cat << EOF >> ../consumers.dat -gtk2_preview libmltgtk2.so +gtk2_preview libmltgtk2$LIBSUF EOF fi diff --git a/src/modules/inigo/Makefile b/src/modules/inigo/Makefile index 4df5926..c313d37 100644 --- a/src/modules/inigo/Makefile +++ b/src/modules/inigo/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltinigo.so +TARGET = ../libmltinigo$(LIBSUF) OBJS = factory.o \ producer_inigo.o @@ -14,7 +14,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/inigo/configure b/src/modules/inigo/configure index c98c930..5296827 100755 --- a/src/modules/inigo/configure +++ b/src/modules/inigo/configure @@ -4,8 +4,8 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -inigo libmltinigo.so -inigo_file libmltinigo.so +inigo libmltinigo$LIBSUF +inigo_file libmltinigo$LIBSUF EOF fi diff --git a/src/modules/jackrack/Makefile b/src/modules/jackrack/Makefile index e2ab8d4..160eb64 100644 --- a/src/modules/jackrack/Makefile +++ b/src/modules/jackrack/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltjackrack.so +TARGET = ../libmltjackrack$(LIBSUF) OBJS = factory.o \ jack_rack.o \ @@ -28,7 +28,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/jackrack/configure b/src/modules/jackrack/configure index 6f647bc..5654a85 100755 --- a/src/modules/jackrack/configure +++ b/src/modules/jackrack/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../filters.dat -jackrack libmltjackrack.so +jackrack libmltjackrack$LIBSUF EOF fi diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile index cfec826..1237c7b 100644 --- a/src/modules/normalize/Makefile +++ b/src/modules/normalize/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltnormalize.so +TARGET = ../libmltnormalize$(LIBSUF) OBJS = factory.o \ filter_volume.o @@ -14,7 +14,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/normalize/configure b/src/modules/normalize/configure index d47e494..ec36a0e 100755 --- a/src/modules/normalize/configure +++ b/src/modules/normalize/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../filters.dat -volume libmltnormalize.so +volume libmltnormalize$LIBSUF EOF fi diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile index 54d5ea9..645fbaa 100644 --- a/src/modules/plus/Makefile +++ b/src/modules/plus/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltplus.so +TARGET = ../libmltplus$(LIBSUF) OBJS = factory.o \ filter_affine.o \ @@ -18,7 +18,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/plus/configure b/src/modules/plus/configure index 25ecd02..77d9ce0 100755 --- a/src/modules/plus/configure +++ b/src/modules/plus/configure @@ -7,14 +7,14 @@ cat << EOF >> ../producers.dat EOF cat << EOF >> ../filters.dat -affine libmltplus.so -charcoal libmltplus.so -invert libmltplus.so -sepia libmltplus.so +affine libmltplus$LIBSUF +charcoal libmltplus$LIBSUF +invert libmltplus$LIBSUF +sepia libmltplus$LIBSUF EOF cat << EOF >> ../transitions.dat -affine libmltplus.so +affine libmltplus$LIBSUF EOF cat << EOF >> ../consumers.dat diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile index 0f036fa..7250641 100644 --- a/src/modules/resample/Makefile +++ b/src/modules/resample/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltresample.so +TARGET = ../libmltresample$(LIBSUF) OBJS = factory.o \ filter_resample.o @@ -16,7 +16,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/resample/configure b/src/modules/resample/configure index 649195e..9d8630a 100755 --- a/src/modules/resample/configure +++ b/src/modules/resample/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../filters.dat -resample libmltresample.so +resample libmltresample$LIBSUF EOF fi diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile index 7a7004c..d40a13e 100644 --- a/src/modules/sdl/Makefile +++ b/src/modules/sdl/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltsdl.so +TARGET = ../libmltsdl$(LIBSUF) OBJS = factory.o \ consumer_sdl.o \ @@ -18,7 +18,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/sdl/configure b/src/modules/sdl/configure index f4556a1..5021991 100755 --- a/src/modules/sdl/configure +++ b/src/modules/sdl/configure @@ -4,9 +4,9 @@ if [ "$help" != "1" ] then cat << EOF >> ../consumers.dat -sdl libmltsdl.so -sdl_preview libmltsdl.so -sdl_still libmltsdl.so +sdl libmltsdl$LIBSUF +sdl_preview libmltsdl$LIBSUF +sdl_still libmltsdl$LIBSUF EOF fi diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile index e156567..9e69741 100644 --- a/src/modules/sox/Makefile +++ b/src/modules/sox/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltsox.so +TARGET = ../libmltsox$(LIBSUF) OBJS = factory.o \ filter_sox.o @@ -16,7 +16,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/sox/configure b/src/modules/sox/configure index 15aa439..987f47e 100755 --- a/src/modules/sox/configure +++ b/src/modules/sox/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../filters.dat -sox libmltsox.so +sox libmltsox$LIBSUF EOF fi diff --git a/src/modules/valerie/Makefile b/src/modules/valerie/Makefile index 9cd7e57..d23e6f0 100644 --- a/src/modules/valerie/Makefile +++ b/src/modules/valerie/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltvalerie.so +TARGET = ../libmltvalerie$(LIBSUF) OBJS = factory.o \ consumer_valerie.o @@ -14,7 +14,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/valerie/configure b/src/modules/valerie/configure index 1ebe527..4149c6d 100755 --- a/src/modules/valerie/configure +++ b/src/modules/valerie/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../consumers.dat -valerie libmltvalerie.so +valerie libmltvalerie$LIBSUF EOF fi diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile index 74a84d8..a367618 100644 --- a/src/modules/vorbis/Makefile +++ b/src/modules/vorbis/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltvorbis.so +TARGET = ../libmltvorbis$(LIBSUF) OBJS = factory.o \ producer_vorbis.o @@ -16,7 +16,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/vorbis/configure b/src/modules/vorbis/configure index bf06011..1b2accb 100755 --- a/src/modules/vorbis/configure +++ b/src/modules/vorbis/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -vorbis libmltvorbis.so +vorbis libmltvorbis$LIBSUF EOF fi diff --git a/src/modules/westley/Makefile b/src/modules/westley/Makefile index 5d9234b..5f8fc34 100644 --- a/src/modules/westley/Makefile +++ b/src/modules/westley/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltwestley.so +TARGET = ../libmltwestley$(LIBSUF) OBJS = factory.o \ consumer_westley.o \ @@ -17,7 +17,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/westley/configure b/src/modules/westley/configure index af068dd..c76eda0 100755 --- a/src/modules/westley/configure +++ b/src/modules/westley/configure @@ -4,12 +4,12 @@ if [ "$help" != "1" ] then cat << EOF >> ../producers.dat -westley libmltwestley.so -westley-xml libmltwestley.so +westley libmltwestley$LIBSUF +westley-xml libmltwestley$LIBSUF EOF cat << EOF >> ../consumers.dat -westley libmltwestley.so +westley libmltwestley$LIBSUF EOF fi diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile index 572ba4c..00ee846 100644 --- a/src/modules/xine/Makefile +++ b/src/modules/xine/Makefile @@ -1,6 +1,6 @@ include ../../../config.mak -TARGET = ../libmltxine.so +TARGET = ../libmltxine$(LIBSUF) OBJS = factory.o \ deinterlace.o \ @@ -16,7 +16,7 @@ SRCS := $(OBJS:.o=.c) all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/src/modules/xine/configure b/src/modules/xine/configure index 3c04324..66934db 100755 --- a/src/modules/xine/configure +++ b/src/modules/xine/configure @@ -4,7 +4,7 @@ if [ "$help" != "1" ] then cat << EOF >> ../filters.dat -deinterlace libmltxine.so +deinterlace libmltxine$LIBSUF EOF fi diff --git a/src/tests/Makefile b/src/tests/Makefile index 70e04b1..ac2b4a3 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -2,14 +2,14 @@ include ../../config.mak TARGET = dan charlie pango pixbuf dissolve luma -CFLAGS += -I.. -rdynamic +CFLAGS += -I.. $(RDYNAMIC) -LDFLAGS += -L ../framework -L ../modules -lmlt -lmltdv -lmltsdl +LDFLAGS += -L../framework -L../modules -lmlt -lmltdv -lmltsdl all: $(TARGET) hello: hello.o - $(CC) hello.o -o $@ -L ../framework -L ../modules -lmlt + $(CC) hello.o -o $@ -L../framework -L../modules -lmlt pango: pango.o $(CC) pango.o -o $@ $(LDFLAGS) diff --git a/src/valerie/Makefile b/src/valerie/Makefile index 8d96f0c..d8b09fb 100644 --- a/src/valerie/Makefile +++ b/src/valerie/Makefile @@ -1,6 +1,6 @@ include ../../config.mak -TARGET = libvalerie.so +TARGET = libvalerie$(LIBSUF) OBJS = valerie.o \ valerie_notifier.o \ @@ -24,13 +24,13 @@ INCS = valerie.h \ SRCS := $(OBJS:.o=.c) -CFLAGS += -I.. -rdynamic -LDFLAGS += -L ../framework -lmlt -lpthread +CFLAGS += -I.. $(RDYNAMIC) +LDFLAGS += -L../framework -lmlt -lpthread all: $(TARGET) $(TARGET): $(OBJS) - $(CC) -shared -o $@ $(OBJS) $(LDFLAGS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend @@ -42,7 +42,7 @@ clean: rm -f $(OBJS) $(TARGET) install: all - install -m 755 $(TARGET) $(prefix)/lib/libvalerie.so + install -m 755 $(TARGET) $(prefix)/lib/libvalerie$(LIBSUF) mkdir -p "$(prefix)/include/mlt/valerie" install -m 644 $(INCS) "$(prefix)/include/mlt/valerie" diff --git a/src/valerie/valerie_socket.c b/src/valerie/valerie_socket.c index e0743c1..2ed79ef 100644 --- a/src/valerie/valerie_socket.c +++ b/src/valerie/valerie_socket.c @@ -33,6 +33,7 @@ #include #include #include +#include /* Application header files */ #include "valerie_socket.h" -- 1.7.4.4