pidgin: f18e8828: Define WIN32_LEAN_AND_MEAN where possibl...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: f18e8828254cc3882e72d3e2af1af3dfa805729e
Ancestor: bc551a0f3f61b07c37e8677925b1aeae91e849be
Author: datallah at pidgin.im
Date: 2009-10-31T19:23:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f18e8828254cc3882e72d3e2af1af3dfa805729e

Modified files:
        libpurple/plugins/perl/Makefile.mingw
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/protocols/silc/Makefile.mingw
        libpurple/protocols/silc10/Makefile.mingw
        libpurple/win32/global.mak pidgin/Makefile.mingw
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/plugins/win32/winprefs/Makefile.mingw

ChangeLog: 

Define WIN32_LEAN_AND_MEAN where possible during the compile to hopefully speed it up.

-------------- next part --------------
============================================================
--- libpurple/plugins/perl/Makefile.mingw	58b2d79403a5bc3bb8f1051709bd2c8d917198c6
+++ libpurple/plugins/perl/Makefile.mingw	1f071e4123c82162b5d8e6ce23ff8d8f4bb4e784
@@ -7,10 +7,12 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = perl
 
 # Perl headers with /* /* */ type comments.. Turn off warnings.
-CFLAGS += -Wno-comment
+GCCWARNINGS += -Wno-comment
 
 ##
 ## INCLUDE PATHS
============================================================
--- libpurple/plugins/perl/common/Makefile.mingw	fc00e34aa100760011bc7f260d46d22a80f1becb
+++ libpurple/plugins/perl/common/Makefile.mingw	459d052ff8711a4d76ced257b51a6985336fb57a
@@ -5,9 +5,12 @@ PIDGIN_TREE_TOP := ../../../..
 #
 
 PIDGIN_TREE_TOP := ../../../..
-GCCWARNINGS := -Wno-comment -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith -Wundef -Wno-unused
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
+
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
 EXTUTILS ?= C:/perl/lib/ExtUtils
============================================================
--- libpurple/protocols/silc/Makefile.mingw	9f3db1d56cb2945f77d03eaf2c9659bafe4aac41
+++ libpurple/protocols/silc/Makefile.mingw	ba0087bda90c612c276729edb2f7cc18b9153b94
@@ -7,6 +7,8 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
 			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll
@@ -79,7 +81,7 @@ $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS
 $(OBJECTS): $(PURPLE_CONFIG_H)
 
 $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x64000000 -o $(TARGET).dll
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x74000000 -o $(TARGET).dll
 
 ##
 ## CLEAN RULES
============================================================
--- libpurple/protocols/silc10/Makefile.mingw	62f584840a4f224ac5f00025c296244b7983bb5f
+++ libpurple/protocols/silc10/Makefile.mingw	f219fe0aab6ec6bf4ec6f16c81171f454e58234f
@@ -7,6 +7,8 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
 			$(SILC_TOOLKIT)/lib/silcclient.dll
============================================================
--- libpurple/win32/global.mak	44519e842cfe2c8d8a9f0ef1af1c8dd73d8e5dfb
+++ libpurple/win32/global.mak	15f4525712280af03e90025b1d37ec3305473dbf
@@ -85,7 +85,7 @@ endif
 DEFINES += -DHAVE_CYRUS_SASL
 endif
 
-DEFINES += -DHAVE_CONFIG_H
+DEFINES += -DHAVE_CONFIG_H -DWIN32_LEAN_AND_MEAN
 
 # Use -g flag when building debug version of Pidgin (including plugins).
 # Use -fnative-struct instead of -mms-bitfields when using mingw 1.1
============================================================
--- pidgin/Makefile.mingw	7c39b3c4f627c4fad417fc9317032b8f6c3075de
+++ pidgin/Makefile.mingw	10e9545e5a243f795f87f81c7b951c7aa1b8a034
@@ -7,6 +7,8 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 PIDGIN_TREE_TOP := ..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
 
 ##
@@ -55,12 +57,12 @@ PIDGIN_C_SRC =	\
 ##
 PIDGIN_C_SRC =	\
 			gtkaccount.c \
-			gtkblist.c \
+			gtkblist-theme-loader.c \
 			gtkblist-theme.c \
-			gtkblist-theme-loader.c \
-			gtkcertmgr.c \
+			gtkblist.c \
 			gtkcellrendererexpander.c \
 			gtkcellrendererprogress.c \
+			gtkcertmgr.c \
 			gtkconn.c \
 			gtkconv.c \
 			gtkdebug.c \
@@ -70,8 +72,8 @@ PIDGIN_C_SRC =	\
 			gtkeventloop.c \
 			gtkexpander.c \
 			gtkft.c \
+			gtkicon-theme-loader.c \
 			gtkicon-theme.c \
-			gtkicon-theme-loader.c \
 			gtkidle.c \
 			gtkimhtml.c \
 			gtkimhtmltoolbar.c \
============================================================
--- pidgin/plugins/perl/common/Makefile.mingw	f50ce5edf97e80925f47ad6f430b51a89259d287
+++ pidgin/plugins/perl/common/Makefile.mingw	45e612f3a26305e8263f30e8e32199d53146de39
@@ -5,9 +5,12 @@ PIDGIN_TREE_TOP := ../../../..
 #
 
 PIDGIN_TREE_TOP := ../../../..
-GCCWARNINGS := -Wno-comment -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith -Wundef -Wno-unused
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
+
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = Pidgin
 EXTUTILS ?= C:/perl/lib/ExtUtils
 
============================================================
--- pidgin/plugins/win32/winprefs/Makefile.mingw	b8e4051972be2afa5c732b8a637fab8bde5050e0
+++ pidgin/plugins/win32/winprefs/Makefile.mingw	09852cb64a1dbf8dabb4c3ca0373d0e12350d35a
@@ -8,6 +8,7 @@ TARGET = winprefs
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = winprefs
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 DEFINES += -DWINVER=0x500
 
 ##