mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 18:20:26 +01:00
-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
This commit is contained in:
parent
790a20ed20
commit
e8111249e5
@ -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()
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -222,7 +222,7 @@ LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY)
|
||||
ifeq ($(strip $(STRIP)),)
|
||||
STRIPCMD =
|
||||
else
|
||||
STRIPCMD = $(STRIP) $@*
|
||||
STRIPCMD = $(STRIP) $@$(BINEXT)
|
||||
endif
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user