From e8111249e55cdb2e1a4bc2e66231484212248719 Mon Sep 17 00:00:00 2001
From: Chris Johnson <devcjohnson@gmail.com>
Date: Fri, 6 Jun 2008 04:38:13 +0000
Subject: [PATCH] -Fix bug [ 1985839 ] strip TARGET* in make all -Tweak MinGW
 configuration file -Modified Tuple.h for sane behavior with MinGW -Modified
 UtilTestSuite.cpp for conditional use of MFC based on availability of
 library; otherwise use console

---
 Foundation/include/Poco/Tuple.h      | 2 +-
 Util/testsuite/src/UtilTestSuite.cpp | 4 ++--
 build/config/MinGW                   | 4 ++--
 build/rules/global                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Foundation/include/Poco/Tuple.h b/Foundation/include/Poco/Tuple.h
index f0cef6fdf..5db06e5b6 100644
--- a/Foundation/include/Poco/Tuple.h
+++ b/Foundation/include/Poco/Tuple.h
@@ -47,7 +47,7 @@
 namespace Poco {
 
 
-#if defined(POCO_OS_FAMILY_WINDOWS)
+#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(MINGW32) 
 #define POCO_TYPEWRAPPER_DEFAULTVALUE(T) TypeWrapper<T>::TYPE()
 #else
 #define POCO_TYPEWRAPPER_DEFAULTVALUE(T) typename TypeWrapper<T>::TYPE()
diff --git a/Util/testsuite/src/UtilTestSuite.cpp b/Util/testsuite/src/UtilTestSuite.cpp
index 2a53a1cf0..40f5f8aee 100644
--- a/Util/testsuite/src/UtilTestSuite.cpp
+++ b/Util/testsuite/src/UtilTestSuite.cpp
@@ -33,7 +33,7 @@
 #include "UtilTestSuite.h"
 #include "ConfigurationTestSuite.h"
 #include "OptionsTestSuite.h"
-#if defined(_WIN32)
+#if defined(_MFC_VER)
 #include "WindowsTestSuite.h"
 #endif
 
@@ -44,7 +44,7 @@ CppUnit::Test* UtilTestSuite::suite()
 
 	pSuite->addTest(ConfigurationTestSuite::suite());
 	pSuite->addTest(OptionsTestSuite::suite());
-#if defined(_WIN32)
+#if defined(_MFC_VER)
 	pSuite->addTest(WindowsTestSuite::suite());
 #endif
 
diff --git a/build/config/MinGW b/build/config/MinGW
index 1e41c4619..d2c6c8b7a 100644
--- a/build/config/MinGW
+++ b/build/config/MinGW
@@ -9,7 +9,7 @@
 #
 # General Settings
 #
-LINKMODE = BOTH
+LINKMODE = STATIC
 POCO_TARGET_OSNAME = MinGW
 POCO_TARGET_OSARCH = ia32
 
@@ -66,7 +66,7 @@ RELEASEOPT_LINK = -O2
 #
 # System Specific Flags
 #
-SYSFLAGS = -mno-cygwin -D_WIN32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DFoundation_Config_INCLUDED -I/usr/local/include -I/usr/include
+SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED -I/usr/local/include -I/usr/include
 
 #
 # System Specific Libraries
diff --git a/build/rules/global b/build/rules/global
index 437e461e8..01ff69243 100644
--- a/build/rules/global
+++ b/build/rules/global
@@ -222,7 +222,7 @@ LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY)
 ifeq ($(strip $(STRIP)),)
 STRIPCMD = 
 else
-STRIPCMD = $(STRIP) $@*
+STRIPCMD = $(STRIP) $@$(BINEXT)
 endif
 
 #