# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1037727491 0
# Node ID e0f868943deef273192ecfc955280caa533e6c85
# Parent  a1245dcf7b310d7934dd5c247bf4959d8ecde370
[gaim-migrate @ 4175]
Flashing window feature now implemented for all Win versions

committer: Tailor Script <tailor@pidgin.im>

diff -r a1245dcf7b31 -r e0f868943dee src/Makefile.mingw
--- a/src/Makefile.mingw	Mon Nov 18 22:51:06 2002 +0000
+++ b/src/Makefile.mingw	Tue Nov 19 17:38:11 2002 +0000
@@ -69,9 +69,7 @@
 			-L$(IDLETRACKER_TOP) \
 			-L$(PERL_LIB_DIR) \
 			-L$(ASPELL_TOP)/lib \
-			-L$(GTKSPELL_TOP)/gtkspell \
-			-L$(MINGW_PLUS_DIR)
-
+			-L$(GTKSPELL_TOP)/gtkspell
 
 ##
 ##  SOURCES, OBJECTS
@@ -85,8 +83,6 @@
 
 HEADER_DEPS =		$(SOUND_H_FILES)
 
-LIB_DEPS =		$(MINGW_PLUS_DIR)/user32plus.lib
-
 DLL_C_SRC =		aim.c \
 			about.c \
 			away.c \
@@ -141,7 +137,6 @@
 			-lws2_32 \
 			-liberty \
 			-lwinmm \
-			-luser32plus \
 			-lperl56 \
 			-laspell-15 \
 			-lIdleTrac
@@ -181,13 +176,6 @@
 	$(MAKE) -C $(GAIM_SRC)/win32/IdleTracker -f Makefile.mingw
 
 #
-# BUILD DEPS
-#
-
-$(MINGW_PLUS_DIR)/user32plus.lib: $(MINGW_PLUS_DIR)/user32plus.def
-	$(MAKE) -C $(MINGW_PLUS_DIR) -f Makefile.mingw user32plus.lib
-
-#
 # BUILD DLL
 #
 
@@ -195,7 +183,7 @@
 	dlltool -D $(TARGET).dll -z $(TARGET).def --export-all-symbols \
 		--exclude-symbols WinMain@16 $^
 
-$(TARGET).base: $(HEADER_DEPS) $(LIB_DEPS) $(DLL_OBJECTS)
+$(TARGET).base: $(HEADER_DEPS) $(DLL_OBJECTS)
 	$(CC) -mdll $(LDFLAGS) -o junk.tmp -Wl,--base-file,$@ $(DLL_OBJECTS) $(LIB_PATHS) $(DLL_LIBS)
 	rm -rf junk.tmp
 
@@ -203,7 +191,7 @@
 	dlltool --dllname $(TARGET).dll --base-file $(TARGET).base \
 		--output-exp $(TARGET).exp --def $(TARGET).def
 
-$(TARGET).dll: $(HEADER_DEPS) $(LIB_DEPS) $(DLL_OBJECTS) $(GAIM_SRC)/win32/IdleTracker/IdleTrac.dll $(TARGET).exp
+$(TARGET).dll: $(HEADER_DEPS) $(DLL_OBJECTS) $(GAIM_SRC)/win32/IdleTracker/IdleTrac.dll $(TARGET).exp
 	$(CC) -mdll $(LDFLAGS) -o $(TARGET).dll $(DLL_OBJECTS) -Wl,$(TARGET).exp $(LIB_PATHS) $(DLL_LIBS)
 	rm -rf $(TARGET).exp $(TARGET).def $(TARGET).base
 
diff -r a1245dcf7b31 -r e0f868943dee src/win32/mingw_plus/winuser_extra.h
--- a/src/win32/mingw_plus/winuser_extra.h	Mon Nov 18 22:51:06 2002 +0000
+++ b/src/win32/mingw_plus/winuser_extra.h	Tue Nov 19 17:38:11 2002 +0000
@@ -27,10 +27,4 @@
     DWORD dwTimeout;
 } FLASHWINFO, *PFLASHWINFO;
 
-/*
- *  PROTOS
- */
-/* From MS user32.lib (mingw 1.1 dosn't have it) */
-extern BOOL FlashWindowEx(PFLASHWINFO pfwi);
-
 #endif /* _WINUSER_EXTRA_H_ */