X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c29c1fead0048abe370c715dbed58f7caa43e6d..32485259c1342115488d219776dfebeb3d4d81b1:/build/bakefiles/regex.bkl?ds=inline diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl index 29fea08244..d57a5c0e15 100644 --- a/build/bakefiles/regex.bkl +++ b/build/bakefiles/regex.bkl @@ -1,26 +1,47 @@ <?xml version="1.0" ?> +<!-- $Id$ --> + <makefile> <if cond="FORMAT=='autoconf'"> <option name="wxUSE_REGEX"/> + <set var="LIB_REGEX"> + <if cond="wxUSE_REGEX=='builtin'"> + wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) + </if> + </set> </if> <if cond="FORMAT!='autoconf'"> - <set var="wxUSE_REGEX">builtin</set> + <set var="wxUSE_REGEX"> + <!-- NB: regex lib doesn't compile on WinCE --> + <if cond="FORMAT=='msevc4prj'">no</if> + <if cond="FORMAT!='msevc4prj'">builtin</if> + </set> + <set var="LIB_REGEX"> + <if cond="wxUSE_REGEX=='builtin'"> + wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) + </if> + </set> </if> - <set var="LIB_REGEX"> - <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)</if> - </set> <set var="INC_REGEX"> <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if> </set> - <lib id="wxregex" template="3rdparty_lib" + <lib id="wxregex" template="msvc_setup_h,3rdparty_lib" cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'"> + <libname cond="FORMAT=='autoconf'"> + $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) + </libname> + <libname cond="FORMAT!='autoconf'"> + $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) + </libname> <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include> <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include> + <define>__WX$(TOOLKIT)__</define> <define>$(UNICODE_DEFINE)</define> <dirname>$(LIBDIRNAME)</dirname> - <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8066</cflags-borland> + <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland> + <cflags-dmars>-w12</cflags-dmars> <sources> src/regex/regcomp.c src/regex/regexec.c