Build fixes.
authordezeroex <dezeroex@d19143bc-622f-0410-bfdd-b5b2a6649095>
Thu, 14 Apr 2005 05:35:57 +0000 (05:35 +0000)
committerdezeroex <dezeroex@d19143bc-622f-0410-bfdd-b5b2a6649095>
Thu, 14 Apr 2005 05:35:57 +0000 (05:35 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@710 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/sdl/Makefile
src/modules/sdl/consumer_sdl_still.c

index d40a13e..f9aac55 100644 (file)
@@ -7,11 +7,17 @@ OBJS = factory.o \
           consumer_sdl_preview.o \
           consumer_sdl_still.o 
 
-CFLAGS += -I../.. `sdl-config --cflags`
+ifeq ($(targetos),Darwin)
+       CFLAGS +=-ObjC
+       LDFLAGS +=-lobjc -framework Foundation
+endif
+
+CFLAGS +=-I../.. `sdl-config --cflags`
+
+LDFLAGS +=`sdl-config --libs`
 
-LDFLAGS += `sdl-config --libs`
+LDFLAGS +=-L../../framework -lmlt
 
-LDFLAGS+=-L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 
index f2146f5..c76740a 100644 (file)
@@ -590,6 +590,7 @@ static int consumer_get_dimensions( int *width, int *height )
        // Get the wm structure
        if ( SDL_GetWMInfo( &wm ) == 1 )
        {
+#ifndef __DARWIN__
                // Check that we have the X11 wm
                if ( wm.subsystem == SDL_SYSWM_X11 ) 
                {
@@ -610,6 +611,7 @@ static int consumer_get_dimensions( int *width, int *height )
                        *width = attr.width;
                        *height = attr.height;
                }
+#endif
        }
 
        return changed;