[Gnash-commit] /srv/bzr/gnash/trunk r11107: fix all problems building with mingw32 GCC 4.4.

[rob]

------------------------------------------------------------
revno: 11107
committer: address@hidden
branch nick: trunk
timestamp: Sat 2009-06-13 14:34:48 -0600
message:
  fix all problems building with mingw32 GCC 4.4.
modified:
  gui/Makefile.am
  libbase/Makefile.am
  libcore/Makefile.am
  utilities/Makefile.am

=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2009-06-06 19:29:06 +0000
+++ b/gui/Makefile.am   2009-06-13 20:34:48 +0000
@@ -108,8 +108,8 @@
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libnet/libgnashnet.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
+       $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libsound/libgnashsound.la \
-       $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libbase/libgnashbase.la
 
 # Only build loadable modules unless statically linking
@@ -120,7 +120,11 @@
 #      LIB_FLAGS = -release $(VERSION)
 # endif # ENABLE_SHARED
 # else # make shared libraries suitable for linking.
-      LIB_FLAGS = -release $(VERSION)
+LIB_FLAGS = -release $(VERSION)
+if WIN32
+LIB_FLAGS += --enable-auto-import
+endif
+
 # endif # DYNAMIC_GUI
 
 # AQUA Toolkit

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2009-04-28 15:22:32 +0000
+++ b/libbase/Makefile.am       2009-06-13 20:34:48 +0000
@@ -77,10 +77,10 @@
        $(CURL_LIBS) \
        $(OPENGL_LIBS) \
        $(LIBINTL) \
+       $(BOOST_LIBS) \
+       $(PTHREAD_LIBS) \
        $(LIBLTDL) \
        $(LIBADD_DL) \
-       $(BOOST_LIBS) \
-       $(PTHREAD_LIBS) \
        $(NULL)
 
 if WIN32
@@ -198,7 +198,8 @@
 inst_HEADERS = $(EXTENSIONS_API)
 endif
 
-libgnashbase_la_LDFLAGS = -release $(VERSION)
+libgnashbase_la_LDFLAGS = -release $(VERSION) $(LIBLTDL)
+libgnashbase_la_DEPENDENCIES = $(LIBLTDL)
 
 if WIN32
   libgnashbase_la_LDFLAGS += -no-undefined

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2009-06-09 07:59:09 +0000
+++ b/libcore/Makefile.am       2009-06-13 20:34:48 +0000
@@ -315,7 +315,7 @@
 endif
 else
   libgnashcore_la_LIBADD += $(top_builddir)/libmedia/libgnashmedia.la \
-       $(top_builddir)/libsound/libgnashsound.la
+       $(top_builddir)/libsound/libgnashsound.la
 endif
 
 # Rebuild with GCC 4.x Mudflap support

=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am     2009-06-07 21:14:22 +0000
+++ b/utilities/Makefile.am     2009-06-13 20:34:48 +0000
@@ -35,14 +35,14 @@
 ## WARNING: make sure GLIB_LIBS appears first
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
 AM_LDFLAGS = \
+       $(LIBINTL) \
        $(LIBADD_DL) \
-       $(LIBLTDL) \
        $(MYSQL_LIBS) \
        $(CURL_LIBS) \
        $(BOOST_LIBS) \
        $(PYTHON_LIBS) \
        $(PTHREAD_LIBS) \
-       $(LIBINTL) \
+       $(LIBLTDL) \
        $(NULL)
 
 localedir = $(datadir)/locale
@@ -87,17 +87,18 @@
 
 gprocessor_SOURCES = processor.cpp
 # export our symbols so they can be used by Gnash plugins
-gprocessor_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
-gprocessor_LDADD = $(GNASH_LIBS) 
+gprocessor_LDFLAGS = -export-dynamic
+gprocessor_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+gprocessor_DEPENDENCIES = $(LTDLDEPS)
 
 dumpshm_SOURCES = dumpshm.cpp
-dumpshm_LDADD = $(GNASH_LIBS)
+dumpshm_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
 
 soldumper_SOURCES = soldumper.cpp
-soldumper_LDADD = $(GNASH_LIBS)
+soldumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
 
 flvdumper_SOURCES = flvdumper.cpp
-flvdumper_LDADD = $(GNASH_LIBS)
+flvdumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap: