/pidgin/main: 1048ba029ac2: win32: get rid of WINVER-like macros...

[Tomasz Wasilczyk]

Changeset: 1048ba029ac2c7b8ea94dc739330d20f93f30adc
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-24 01:15 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1048ba029ac2

Description:

win32: get rid of WINVER-like macros. If we need it, define globally. linux: fix pc files and -lapp flag

diffstat:

 finch/finch.pc.in               |  2 +-
 libpurple/win32/win32dep.c      |  1 -
 pidgin/pidgin-3.pc.in           |  1 +
 pidgin/win32/gtkdocklet-win32.c |  1 -
 pidgin/win32/gtkwin32dep.c      |  5 -----
 5 files changed, 2 insertions(+), 8 deletions(-)

diffs (54 lines):

diff --git a/finch/finch.pc.in b/finch/finch.pc.in
--- a/finch/finch.pc.in
+++ b/finch/finch.pc.in
@@ -11,4 +11,4 @@ Description: Finch is an instant messeng
 Version: @VERSION@
 Requires: gnt purple
 Cflags: -I${includedir}/finch
-
+Libs: -L${libdir} -lfinch
diff --git a/libpurple/win32/win32dep.c b/libpurple/win32/win32dep.c
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#define _WIN32_IE 0x501
 #include "internal.h"
 #include <winuser.h>
 
diff --git a/pidgin/pidgin-3.pc.in b/pidgin/pidgin-3.pc.in
--- a/pidgin/pidgin-3.pc.in
+++ b/pidgin/pidgin-3.pc.in
@@ -13,3 +13,4 @@ Description: Pidgin is a GTK2-based inst
 Version: @VERSION@
 Requires: @GTK_PC_MODULE@ @WEBKIT_PC_MODULE@ purple-3
 Cflags: -I${includedir}
+Libs: -L${libdir} -lpidgin
diff --git a/pidgin/win32/gtkdocklet-win32.c b/pidgin/win32/gtkdocklet-win32.c
--- a/pidgin/win32/gtkdocklet-win32.c
+++ b/pidgin/win32/gtkdocklet-win32.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1301, USA.
  */
-#define _WIN32_IE 0x0500
 #include <windows.h>
 #include <gdk/gdkwin32.h>
 #include <gdk/gdk.h>
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -21,11 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#define _WIN32_IE 0x500
-#ifndef WINVER
-#define WINVER 0x0500 /* W2K */
-#endif
-
 #include "internal.h"
 
 #include <io.h>