/pidgin/main: 1b074557f2b0: cross-win32: build win32 plugins

[Tomasz Wasilczyk]

Changeset: 1b074557f2b0c270931094c99d5c13f72d68886b
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-17 18:02 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1b074557f2b0

Description:

cross-win32: build win32 plugins

diffstat:

 configure.ac                                   |   2 ++
 pidgin/plugins/Makefile.am                     |   6 ++++++
 pidgin/plugins/win32/transparency/Makefile.am  |  16 ++++++++++++++++
 pidgin/plugins/win32/transparency/win2ktrans.c |   3 +--
 pidgin/plugins/win32/winprefs/Makefile.am      |  19 +++++++++++++++++++
 pidgin/plugins/win32/winprefs/winprefs.c       |   2 +-
 6 files changed, 45 insertions(+), 3 deletions(-)

diffs (99 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3023,6 +3023,8 @@ AC_CONFIG_FILES([Makefile
 		   pidgin/plugins/perl/Makefile
 		   pidgin/plugins/perl/common/Makefile.PL
 		   pidgin/plugins/ticker/Makefile
+		   pidgin/plugins/win32/transparency/Makefile
+		   pidgin/plugins/win32/winprefs/Makefile
 		   pidgin/themes/Makefile
 		   pidgin/win32/pidgin_dll_rc.rc
 		   pidgin/win32/pidgin_exe_rc.rc
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -29,6 +29,12 @@ SUBDIRS = \
 	disco \
 	ticker
 
+if IS_WIN32
+SUBDIRS += \
+	win32/winprefs \
+	win32/transparency
+endif
+
 plugindir = $(libdir)/pidgin
 
 contact_priority_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
diff --git a/pidgin/plugins/win32/transparency/Makefile.am b/pidgin/plugins/win32/transparency/Makefile.am
new file mode 100644
--- /dev/null
+++ b/pidgin/plugins/win32/transparency/Makefile.am
@@ -0,0 +1,16 @@
+plugindir = $(libdir)/pidgin
+
+plugin_LTLIBRARIES = win2ktrans.la
+
+win2ktrans_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+win2ktrans_la_SOURCES = win2ktrans.c
+win2ktrans_la_LIBADD = @PIDGIN_LIBS@
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/pidgin \
+	$(DEBUG_CPPFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(PLUGIN_CFLAGS)
diff --git a/pidgin/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
--- a/pidgin/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
@@ -22,9 +22,8 @@
  *
  */
 
-#include "config.h"
+#include "internal.h"
 #include <gdk/gdkwin32.h>
-#include "internal.h"
 
 #include "core.h"
 #include "prefs.h"
diff --git a/pidgin/plugins/win32/winprefs/Makefile.am b/pidgin/plugins/win32/winprefs/Makefile.am
new file mode 100644
--- /dev/null
+++ b/pidgin/plugins/win32/winprefs/Makefile.am
@@ -0,0 +1,19 @@
+plugindir = $(libdir)/pidgin
+
+plugin_LTLIBRARIES = winprefs.la
+
+winprefs_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
+winprefs_la_SOURCES = \
+	gtkappbar.c \
+	gtkappbar.h \
+	winprefs.c
+winprefs_la_LIBADD = @PIDGIN_LIBS@
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/pidgin \
+	$(DEBUG_CPPFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(PLUGIN_CFLAGS)
diff --git a/pidgin/plugins/win32/winprefs/winprefs.c b/pidgin/plugins/win32/winprefs/winprefs.c
--- a/pidgin/plugins/win32/winprefs/winprefs.c
+++ b/pidgin/plugins/win32/winprefs/winprefs.c
@@ -22,7 +22,7 @@
  */
 #include "internal.h"
 
-#include "gtkwin32dep.h"
+#include "pidgin.h"
 
 #include "core.h"
 #include "debug.h"