generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-17 07:13:27 +02:00
Code Issues Projects Releases Wiki Activity

-Fix bug [ 1985839 ] strip TARGET* in make all

Browse Source 
-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
This commit is contained in:
Chris Johnson 2008-06-06 04:38:13 +00:00
parent 790a20ed20
commit e8111249e5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/include/Poco/Tuple.h
View File

@ -47,7 +47,7 @@
namespace Poco { namespace Poco {
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(MINGW32)
#define POCO_TYPEWRAPPER_DEFAULTVALUE(T) TypeWrapper<T>::TYPE() #define POCO_TYPEWRAPPER_DEFAULTVALUE(T) TypeWrapper<T>::TYPE()
#else #else
#define POCO_TYPEWRAPPER_DEFAULTVALUE(T) typename TypeWrapper<T>::TYPE() #define POCO_TYPEWRAPPER_DEFAULTVALUE(T) typename TypeWrapper<T>::TYPE()

4
Util/testsuite/src/UtilTestSuite.cpp
View File

@ -33,7 +33,7 @@
#include "UtilTestSuite.h" #include "UtilTestSuite.h"
#include "ConfigurationTestSuite.h" #include "ConfigurationTestSuite.h"
#include "OptionsTestSuite.h" #include "OptionsTestSuite.h"
#if defined(_WIN32) #if defined(_MFC_VER)
#include "WindowsTestSuite.h" #include "WindowsTestSuite.h"
#endif #endif
@ -44,7 +44,7 @@ CppUnit::Test* UtilTestSuite::suite()
pSuite->addTest(ConfigurationTestSuite::suite()); pSuite->addTest(ConfigurationTestSuite::suite());
pSuite->addTest(OptionsTestSuite::suite()); pSuite->addTest(OptionsTestSuite::suite());
#if defined(_WIN32) #if defined(_MFC_VER)
pSuite->addTest(WindowsTestSuite::suite()); pSuite->addTest(WindowsTestSuite::suite());
#endif #endif

4
build/config/MinGW
View File

@ -9,7 +9,7 @@
# #
# General Settings # General Settings
# #
LINKMODE = BOTH LINKMODE = STATIC
POCO_TARGET_OSNAME = MinGW POCO_TARGET_OSNAME = MinGW
POCO_TARGET_OSARCH = ia32 POCO_TARGET_OSARCH = ia32
@ -66,7 +66,7 @@ RELEASEOPT_LINK = -O2
# #
# System Specific Flags # 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 # System Specific Libraries

2
build/rules/global
View File

@ -222,7 +222,7 @@ LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY)
ifeq ($(strip $(STRIP)),) ifeq ($(strip $(STRIP)),)
STRIPCMD = STRIPCMD =
else else
STRIPCMD = $(STRIP) $@* STRIPCMD = $(STRIP) $@$(BINEXT)
endif endif
# #