mirror of
https://github.com/boostorg/regex.git
synced 2025-07-29 20:17:24 +02:00
Improve ICU configuration.
Update makefiles. Add VC8 makefile. [SVN r29658]
This commit is contained in:
@ -134,42 +134,50 @@ function vc6_gen()
|
||||
rm -f $iout
|
||||
stlport_suffix=""
|
||||
|
||||
if test ${subdir} != "vc8" ; then
|
||||
libname="libboost_regex-${subdir}-s-${boost_version}"
|
||||
opts='/c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD '"$release_extra"' '
|
||||
opts='/c /nologo /ML /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD '"$release_extra"' '
|
||||
vc6_gen_lib
|
||||
fi
|
||||
|
||||
libname="libboost_regex-${subdir}-mt-s-${boost_version}"
|
||||
opts='/nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD '"$release_extra"' /c'
|
||||
opts='/nologo /MT /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD '"$release_extra"' /c'
|
||||
vc6_gen_lib
|
||||
|
||||
if test ${subdir} != "vc8" ; then
|
||||
debug="yes"
|
||||
libname="libboost_regex-${subdir}-sgd-${boost_version}"
|
||||
opts='/nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD '"$debug_extra"' /c '
|
||||
opts='/nologo /MLd /W3 /Gm '$EH_OPTS' /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD '"$debug_extra"' /c '
|
||||
vc6_gen_lib
|
||||
fi
|
||||
|
||||
libname="libboost_regex-${subdir}-mt-sgd-${boost_version}"
|
||||
opts='/nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD '"$debug_extra"' /c'
|
||||
opts='/nologo /MTd /W3 /Gm '$EH_OPTS' /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD '"$debug_extra"' /c'
|
||||
vc6_gen_lib
|
||||
|
||||
libname="boost_regex-${subdir}-mt-gd-${boost_version}"
|
||||
opts='/nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD '"$debug_extra"' /c'
|
||||
opts='/nologo /MDd /W3 /Gm '$EH_OPTS' /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD '"$debug_extra"' /c'
|
||||
vc6_gen_dll
|
||||
|
||||
debug="no"
|
||||
opts='/nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD '"$release_extra"' /c'
|
||||
opts='/nologo /MD /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD '"$release_extra"' /c'
|
||||
libname="boost_regex-${subdir}-mt-${boost_version}"
|
||||
vc6_gen_dll
|
||||
|
||||
debug="no"
|
||||
opts='/nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD '"$release_extra"' /c'
|
||||
opts='/nologo /MD /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD '"$release_extra"' /c'
|
||||
libname="libboost_regex-${subdir}-mt-${boost_version}"
|
||||
vc6_gen_lib
|
||||
|
||||
debug="yes"
|
||||
libname="libboost_regex-${subdir}-mt-gd-${boost_version}"
|
||||
opts='/nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD '"$debug_extra"' /c'
|
||||
opts='/nologo /MDd /W3 /Gm '$EH_OPTS' /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD '"$debug_extra"' /c'
|
||||
vc6_gen_lib
|
||||
|
||||
|
||||
if test ${subdir} != "vc8" ; then
|
||||
VC8_CHECK="MSVCDIR=\$(VS80COMNTOOLS)..\\..\\VC"
|
||||
fi
|
||||
|
||||
cat > $out << EOF
|
||||
#
|
||||
# auto generated makefile for VC6 compiler
|
||||
@ -208,6 +216,8 @@ NULL=
|
||||
NULL=nul
|
||||
!ENDIF
|
||||
|
||||
$VC8_CHECK
|
||||
|
||||
!IF "\$(MSVCDIR)" == ""
|
||||
!ERROR Variable MSVCDIR not set.
|
||||
!ENDIF
|
||||
@ -255,42 +265,42 @@ function vc6_stlp_gen()
|
||||
stlport_suffix="-stlport"
|
||||
|
||||
libname="libboost_regex-${subdir}-mt-sp-${boost_version}"
|
||||
opts='/nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB '"$release_extra"' /c'
|
||||
opts='/nologo /MT /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB '"$release_extra"' /c'
|
||||
vc6_gen_lib
|
||||
|
||||
debug="true"
|
||||
libname="libboost_regex-${subdir}-mt-sgdp-${boost_version}"
|
||||
opts='/nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB '"$debug_extra"' /c'
|
||||
opts='/nologo /MTd /W3 /Gm '$EH_OPTS' /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB '"$debug_extra"' /c'
|
||||
#vc6_gen_lib
|
||||
|
||||
libname="boost_regex-${subdir}-mt-gdp-${boost_version}"
|
||||
opts='/nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
opts='/nologo /MDd /W3 /Gm '$EH_OPTS' /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
#vc6_gen_dll
|
||||
|
||||
debug="no"
|
||||
opts='/nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL '"$release_extra"' /c'
|
||||
opts='/nologo /MD /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL '"$release_extra"' /c'
|
||||
libname="boost_regex-${subdir}-mt-p-${boost_version}"
|
||||
vc6_gen_dll
|
||||
|
||||
debug="no"
|
||||
opts='/nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL '"$release_extra"' /c'
|
||||
opts='/nologo /MD /W3 '$EH_OPTS' /O2 '$PROC_OPTS' /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL '"$release_extra"' /c'
|
||||
libname="libboost_regex-${subdir}-mt-p-${boost_version}"
|
||||
vc6_gen_lib
|
||||
|
||||
debug="true"
|
||||
libname="libboost_regex-${subdir}-mt-gdp-${boost_version}"
|
||||
opts='/nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
opts='/nologo /MDd /W3 /Gm '$EH_OPTS' /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
#vc6_gen_lib
|
||||
|
||||
# debug STLPort mode:
|
||||
debug="yes"
|
||||
opts='/nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
opts='/nologo /MDd /W3 /Gm '$EH_OPTS' /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
libname="boost_regex-${subdir}-mt-gdp-${boost_version}"
|
||||
vc6_gen_dll
|
||||
libname="libboost_regex-${subdir}-mt-sgdp-${boost_version}"
|
||||
opts='/nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB '"$debug_extra"' /c'
|
||||
opts='/nologo /MTd /W3 /Gm '$EH_OPTS' /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB '"$debug_extra"' /c'
|
||||
vc6_gen_lib
|
||||
opts='/nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
opts='/nologo /MDd /W3 /Gm '$EH_OPTS' /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL '"$debug_extra"' /c'
|
||||
libname="libboost_regex-${subdir}-mt-gdp-${boost_version}"
|
||||
vc6_gen_lib
|
||||
|
||||
@ -376,9 +386,15 @@ EOF
|
||||
|
||||
. common.sh
|
||||
|
||||
#
|
||||
# options that change with compiler version:
|
||||
#
|
||||
EH_OPTS="/GX"
|
||||
PROC_OPTS="/GB"
|
||||
|
||||
#
|
||||
# generate vc6 makefile:
|
||||
debug_extra="/GX"
|
||||
debug_extra="$EH_OPTS"
|
||||
out="vc6.mak"
|
||||
subdir="vc6"
|
||||
vc6_gen
|
||||
@ -391,7 +407,7 @@ subdir="vc6"
|
||||
vc6_stlp_gen
|
||||
#
|
||||
# generate vc7 makefile:
|
||||
debug_extra="/GX /RTC1 /Zc:wchar_t"
|
||||
debug_extra="$EH_OPTS /RTC1 /Zc:wchar_t"
|
||||
release_extra="/Zc:wchar_t"
|
||||
is_stlport="no"
|
||||
out="vc7.mak"
|
||||
@ -419,6 +435,16 @@ out="vc71-stlport.mak"
|
||||
no_single="yes"
|
||||
subdir="vc71"
|
||||
vc6_stlp_gen
|
||||
#
|
||||
# generate vc8 makefile:
|
||||
EH_OPTS="/EHsc"
|
||||
PROC_OPTS=""
|
||||
debug_extra="$EH_OPTS"
|
||||
is_stlport="no"
|
||||
out="vc8.mak"
|
||||
no_single="no"
|
||||
subdir="vc8"
|
||||
vc6_gen
|
||||
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user