[trunk] Merge from branch 1.4.4 rev 1834 (MingW build issue)

This commit is contained in:
Shan Jiang 2012-06-09 09:51:23 +00:00
parent f1abbfb94e
commit 1a133994a7

View File

@ -9,7 +9,7 @@
# #
# General Settings # General Settings
# #
LINKMODE ?= STATIC LINKMODE = STATIC
POCO_TARGET_OSNAME = MinGW POCO_TARGET_OSNAME = MinGW
POCO_TARGET_OSARCH = ia32 POCO_TARGET_OSARCH = ia32
@ -21,7 +21,7 @@ CXX = g++
LINK = $(CXX) LINK = $(CXX)
LIB = ar -cr LIB = ar -cr
RANLIB = ranlib RANLIB = ranlib
SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
SHLIBLN = $(POCO_BASE)/build/script/shlibln SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = strip STRIP = strip
DEP = $(POCO_BASE)/build/script/makedepend.gcc DEP = $(POCO_BASE)/build/script/makedepend.gcc
@ -66,7 +66,7 @@ RELEASEOPT_LINK = -O2
# #
# System Specific Flags # System Specific Flags
# #
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 SYSFLAGS = -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