From 61812cb57124f0c6fd144f7bd751c97a22b99f5d Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Thu, 10 Apr 2014 10:09:05 +0000
Subject: modified for newer MinGW environment. Fixed linking.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3383 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog                    | 9 +++++++++
 configure.in                 | 8 ++++++--
 libsylph/Makefile.am         | 2 +-
 libsylph/libsylph-0.def      | 1 -
 makewin32.sh                 | 4 ++--
 src/Makefile.am              | 2 ++
 src/libsylpheed-plugin-0.def | 1 -
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c7b3dc4..1ac5aa4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-10
+
+	* libsylph/libsylph-0.def
+	  libsylph/Makefile.am
+	  src/Makefile.am
+	  src/libsylpheed-plugin-0.def
+	  configure.in
+	  makewin32.sh: modified for newer MinGW environment. Fixed linking.
+
 2014-04-09
 
 	* macosx/bundle/launcher.sh
diff --git a/configure.in b/configure.in
index 65a92d9e..191552e6 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MICRO_VERSION=1
 INTERFACE_AGE=1
 BINARY_AGE=1
 EXTRA_VERSION=
-BUILD_REVISION=1156
+BUILD_REVISION=1157
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl define if this is a development release
@@ -83,12 +83,16 @@ case "$target" in
 *-*-mingw*)
 	native_win32=yes
 	CFLAGS="$CFLAGS -mms-bitfields -mwindows"
-	LIBS="$LIBS -lws2_32 -lwinmm"
+	LIBS="$LIBS"
+	LIBSYLPH_LIBS="-lws2_32 -lwinmm"
+	SYLPHEED_LIBS="-lole32 -Wl,-luuid"
 	AC_CHECK_PROG(WINDRES, windres, windres)
 	;;
 esac
 
 AC_SUBST(LIBSYLPH_CFLAGS)
+AC_SUBST(LIBSYLPH_LIBS)
+AC_SUBST(SYLPHEED_LIBS)
 
 AM_CONDITIONAL(NATIVE_WIN32, test "$native_win32" = "yes")
 
diff --git a/libsylph/Makefile.am b/libsylph/Makefile.am
index 77607fa8..8f2b76be 100644
--- a/libsylph/Makefile.am
+++ b/libsylph/Makefile.am
@@ -109,7 +109,7 @@ libsylph_0_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-dynamic $(no_undefined) $(export_symbols)
 
-libsylph_0_la_LIBADD = $(GLIB_LIBS)
+libsylph_0_la_LIBADD = $(GLIB_LIBS) $(LIBICONV) $(LIBSYLPH_LIBS)
 
 syl-marshal.h: syl-marshal.list
 	$(GLIB_GENMARSHAL) $< --header --prefix=syl_marshal > $@
diff --git a/libsylph/libsylph-0.def b/libsylph/libsylph-0.def
index 7bcf893d..939cf1fc 100644
--- a/libsylph/libsylph-0.def
+++ b/libsylph/libsylph-0.def
@@ -1,4 +1,3 @@
-; c:\MinGW\bin\dlltool.exe -z libsylph-0.def --export-all-symbols --exclude-symbols _s_tempnam .libs/account.o .libs/base64.o .libs/codeconv.o .libs/customheader.o .libs/displayheader.o .libs/filter.o .libs/folder.o .libs/html.o .libs/imap.o .libs/mbox.o .libs/md5.o .libs/md5_hmac.o .libs/mh.o .libs/news.o .libs/nntp.o .libs/pop.o .libs/prefs.o .libs/prefs_account.o .libs/prefs_common.o .libs/procheader.o .libs/procmime.o .libs/procmsg.o .libs/quoted-printable.o .libs/recv.o .libs/session.o .libs/smtp.o .libs/socket.o .libs/ssl.o .libs/stringtable.o .libs/syl-marshal.o .libs/sylmain.o .libs/unmime.o .libs/utils.o .libs/uuencode.o .libs/virtual.o .libs/xml.o
 EXPORTS
 	account_address_exist @ 1
 	account_append @ 2
diff --git a/makewin32.sh b/makewin32.sh
index 5dc6cadd..fefc7376 100755
--- a/makewin32.sh
+++ b/makewin32.sh
@@ -4,10 +4,10 @@ export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/lib
 export C_INCLUDE_PATH=$C_INCLUDE_PATH:/usr/local/include
 
 ./configure --prefix=$HOME/dist \
-  --with-localedir=lib/locale \
+  --with-localedir=share/locale \
   --with-themedir=share/icons \
   --enable-oniguruma --enable-threads \
-  'CC=gcc -mtune=pentium3' CFLAGS=-O3 \
+  'CC=gcc -mtune=core2' CFLAGS=-O3 \
   && make \
   && make install-strip \
   && (cd plugin/attachment_tool; make install-plugin) \
diff --git a/src/Makefile.am b/src/Makefile.am
index cee14d00..ef567861 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,6 +126,7 @@ libsylpheed_plugin_0_la_LDFLAGS = \
 
 libsylpheed_plugin_0_la_LIBADD = \
 	$(GTK_LIBS) \
+	$(GLIB_LIBS) \
 	../libsylph/libsylph-0.la
 
 EXTRA_DIST = \
@@ -158,6 +159,7 @@ sylpheed_LDADD = \
 	$(GPGME_LIBS) \
 	$(LDAP_LIBS) \
 	$(LIBICONV) \
+	$(SYLPHEED_LIBS) \
 	libsylpheed-plugin-0.la \
 	../libsylph/libsylph-0.la \
 	$(SYLPHEED_RES)
diff --git a/src/libsylpheed-plugin-0.def b/src/libsylpheed-plugin-0.def
index f082caf6..aa0a94f5 100644
--- a/src/libsylpheed-plugin-0.def
+++ b/src/libsylpheed-plugin-0.def
@@ -1,4 +1,3 @@
-; c:\MinGW\bin\dlltool.exe -z libsylpheed-plugin-0.def --export-all-symbols .libs/plugin.o
 EXPORTS
 	syl_plugin_add_factory_item @ 1
 	syl_plugin_add_menuitem @ 2
-- 
cgit v1.2.3