X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1bf307a46cd451f18e012a9d49d2cab2f68f42a..673ae68a3c63f85da2f58f50c858efb9deeff79c:/build/bakefiles/regex.bkl?ds=inline diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl index 1f21a66ef5..28176a5c54 100644 --- a/build/bakefiles/regex.bkl +++ b/build/bakefiles/regex.bkl @@ -2,7 +2,7 @@ <!-- $Id$ --> <makefile> - + <if cond="FORMAT=='autoconf'"> <option name="wxUSE_REGEX"/> <set var="LIB_REGEX"> @@ -19,7 +19,7 @@ </set> <set var="LIB_REGEX"> <if cond="wxUSE_REGEX=='builtin'"> - wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX) + wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) </if> </set> </if> @@ -33,11 +33,12 @@ $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) </libname> <libname cond="FORMAT!='autoconf'"> - $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX) + $(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>$(WXUNIV_DEFINE)</define> <define>$(UNICODE_DEFINE)</define> <dirname>$(LIBDIRNAME)</dirname> <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>