Fix gtk2 build on mingw.

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 21cf033f2f5e41673cf250cb78d02eea6fa4467a..d8d20aeaedbc5ca628ff51f25835a50ce621ecf0 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -39,10 +39,18 @@ LDFLAGS += `pkg-config pangoft2 --libs`
 ifeq ($(targetos),FreeBSD)
 LDFLAGS += -liconv
 endif
+ifeq ($(targetos), MinGW)
+LDFLAGS += -liconv
+endif
 endif
 
 SRCS := $(OBJS:.o=.c)
 
+ifeq ($(targetos), MinGW)
+OBJS += ../../win32/win32.o
+SRCS += ../../win32/win32.c
+endif
+
 all:   $(TARGET)
 
 $(TARGET): $(OBJS) $(ASM_OBJS)

diff --git a/src/modules/gtk2/consumer_gtk2.c b/src/modules/gtk2/consumer_gtk2.c
index dc1619e334ede17dc62b42225a76a04f37822f20..d50cbb33dd7e660c680822cd6dc1907fc34c3b72 100644 (file)
--- a/src/modules/gtk2/consumer_gtk2.c
+++ b/src/modules/gtk2/consumer_gtk2.c
@@ -22,7 +22,11 @@
 #include <framework/mlt_consumer.h>
 #include <framework/mlt_factory.h>
 #include <gdk/gdk.h>
+#ifdef WIN32
+#include <gdk/gdkwin32.h>
+#else
 #include <gdk/gdkx.h>
+#endif
 #include <gtk/gtk.h>
 
 mlt_consumer consumer_gtk2_preview_init( mlt_profile profile, GtkWidget *widget )
@@ -33,9 +37,13 @@ mlt_consumer consumer_gtk2_preview_init( mlt_profile profile, GtkWidget *widget
        // This is a nasty little hack which is required by SDL
        if ( widget != NULL )
        {
-        Window xwin = GDK_WINDOW_XWINDOW( widget->window );
+#ifdef WIN32
+               HWND xwin = GDK_WINDOW_HWND( widget->window );
+#else
+               Window xwin = GDK_WINDOW_XWINDOW( widget->window );
+#endif
         char windowhack[ 32 ];
-        sprintf( windowhack, "%ld", xwin );
+        sprintf( windowhack, "%ld", (long) xwin );
         setenv( "SDL_WINDOWID", windowhack, 1 );
        }
 

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 3721f097c029f2f5bf1757c13ea49874e5f6c645..6fd127d6fe6f211c4017081f02ff98367cb70000 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -124,7 +124,7 @@ static void load_filenames( producer_pixbuf this, mlt_properties producer_proper
        {
                // Generate a temporary file for the svg
                char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
-               int fd = mkstemp( fullname );
+               int fd = g_mkstemp( fullname );
 
                if ( fd > -1 )
                {