/pidgin/main: c8acfe6aa569: cross-win32: hide winconsole for Pid...

Tomasz Wasilczyk twasilczyk at pidgin.im
Sat Apr 26 17:13:17 EDT 2014


Changeset: c8acfe6aa56975240d1008f8ef2cdd1243ae3687
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-26 23:13 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/c8acfe6aa569

Description:

cross-win32: hide winconsole for Pidgin; set output to utf8

diffstat:

 pidgin/Makefile.am |  10 +++++-----
 pidgin/pidgin.c    |   4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (38 lines):

diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -207,15 +207,15 @@ 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)
 
+if IS_WIN32
+libpidgin_la_LIBADD += -lwinmm
+pidgin_LDFLAGS += -mwindows
+endif
+
 AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple/ \
diff --git a/pidgin/pidgin.c b/pidgin/pidgin.c
--- a/pidgin/pidgin.c
+++ b/pidgin/pidgin.c
@@ -34,6 +34,10 @@ int main(int argc, char *argv[])
 {
 	const gchar *test_prgname;
 
+#ifdef _WIN32
+	SetConsoleOutputCP(65001); /* UTF-8 */
+#endif
+
 #if !GLIB_CHECK_VERSION(2, 32, 0)
 	/* GLib threading system is automaticaly initialized since 2.32.
 	 * For earlier versions, it have to be initialized before calling any



More information about the Commits mailing list