/pidgin/main: b7fc060d5c94: cross-win32: Pidgin builds now

[Tomasz Wasilczyk]

Changeset: b7fc060d5c942ee425c5c5e05516947365a885fa
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-16 02:58 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/b7fc060d5c94

Description:

cross-win32: Pidgin builds now

diffstat:

 pidgin/Makefile.am         |  30 ++++++++++++++++++++++++++++++
 pidgin/win32/gtkwin32dep.c |   1 -
 pidgin/win32/wspell.c      |   2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diffs (70 lines):

diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -144,6 +144,31 @@ pidgin_SOURCES = \
 
 noinst_HEADERS= gtkinternal.h
 
+if IS_WIN32
+libpidgin_la_SOURCES += \
+	win32/gtkwin32dep.c \
+	win32/untar.c \
+	win32/wspell.c
+
+# Files that looks like obsolete (were used in Pidgin2):
+#	win32/gtkdocklet-win32.c
+#	win32/MinimizeToTray.c
+#	win32/MinimizeToTray.h
+
+# Files not yet handled:
+#	win32/pidgin_dll_rc.rc
+#	win32/pidgin_exe_rc.rc
+
+pidgin_SOURCES += \
+	win32/winpidgin.c
+
+libpidgin_la_headers += \
+	win32/gtkwin32dep.h \
+	win32/resource.h \
+	win32/untar.h \
+	win32/wspell.h
+endif
+
 libpidginincludedir=$(includedir)/pidgin
 libpidgininclude_HEADERS = \
 	$(libpidgin_la_headers)
@@ -181,6 +206,11 @@ libpidgin_la_LIBADD = \
 	$(X11_LIBS) \
 	$(top_builddir)/libpurple/libpurple.la
 
+if IS_WIN32
+libpidgin_la_LIBADD += \
+	-lwinmm
+endif
+
 pidgin_DEPENDENCIES = $(builddir)/libpidgin.la
 pidgin_LDFLAGS = -export-dynamic
 pidgin_LDADD = $(builddir)/libpidgin.la $(libpidgin_la_LIBADD)
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -47,7 +47,6 @@
 #include "untar.h"
 
 #include "gtkwin32dep.h"
-#include "win32dep.h"
 #include "gtkconv.h"
 #include "gtkconn.h"
 #include "util.h"
diff --git a/pidgin/win32/wspell.c b/pidgin/win32/wspell.c
--- a/pidgin/win32/wspell.c
+++ b/pidgin/win32/wspell.c
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <gtkspell/gtkspell.h>
 #include "debug.h"
-#include "win32dep.h"
+#include "internal.h"
 #include "wspell.h"
 
 /* Intermediate function so that we can eat Enchant error popups when it doesn't find a DLL