Apply ldflags-order part of ldflags_order patch from Alberto Villa.

[melted] / src / modules / gtk2 / Makefile

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 7990bc9..de5fa2f 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -5,6 +5,9 @@ TARGET = ../libmltgtk2$(LIBSUF)
 
 OBJS = factory.o
 
+CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt
+
 ifdef USE_GTK2
 OBJS += consumer_gtk2.o
 CFLAGS += `pkg-config gtk+-2.0 --cflags`
@@ -18,8 +21,10 @@ LDFLAGS += `pkg-config gdk-pixbuf-2.0 --libs`
 endif
 
 ifdef MMX_FLAGS
+ifndef ARCH_X86_64
 ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o
 endif
+endif
 
 ifdef USE_PANGO
 OBJS += producer_pango.o
@@ -27,9 +32,6 @@ CFLAGS += `pkg-config pangoft2 --cflags`
 LDFLAGS += `pkg-config pangoft2 --libs`
 endif
 
-CFLAGS += -I../..
-LDFLAGS+=-L../../framework -lmlt
-
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)