Fix race condition in mlt_consumer_stop().

[mlt] / src / modules / sdl / Makefile

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index a18191e83d2fe801a2a2815aa5ebdb9fcd862b56..e368730c0226c74c02708ed876a3be0ec7c3f230 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -1,3 +1,7 @@
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt -lpthread -lm
+
 include ../../../config.mak
 
 include config.mak
@@ -6,21 +10,20 @@ TARGET = ../libmltsdl$(LIBSUF)
 
 OBJS = factory.o \
           consumer_sdl.o \
+          consumer_sdl_audio.o \
           consumer_sdl_preview.o \
           consumer_sdl_still.o 
 
 ifeq ($(targetos),Darwin)
-       CFLAGS +=-ObjC
-       LDFLAGS +=-lobjc -framework Foundation
-else
-       LDFLAGS +=-lX11
+CFLAGS += -ObjC
+LDFLAGS += -lobjc -framework Foundation
+else ifneq ($(targetos), MinGW)
+LDFLAGS += -lX11
 endif
 
-CFLAGS +=-I../.. `sdl-config --cflags`
-
-LDFLAGS +=`sdl-config --libs`
+CFLAGS += `sdl-config --cflags`
 
-LDFLAGS +=-L../../framework -lmlt
+LDFLAGS += `sdl-config --libs`
 
 ifeq ($(WITH_SDL_IMAGE),1)
 OBJS += producer_sdl_image.o
@@ -29,6 +32,10 @@ LDFLAGS += -lSDL_image
 endif
 
 SRCS := $(OBJS:.o=.c)
+ifeq ($(targetos),Darwin)
+OBJS += consumer_sdl_osx.o
+SRCS += consumer_sdl_osx.m consumer_sdl_osx.h
+endif
 
 all:   $(TARGET)
 
@@ -45,7 +52,9 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
+       install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)"
+       install -d "$(DESTDIR)$(mltdatadir)/sdl"
+       install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/sdl"
 
 ifneq ($(wildcard .depend),)
 include .depend