reverted JS' rev. 1.27 - the real fix was 1.28, disabling recursion protection is...

[wxWidgets.git] / build / bakefiles / regex.bkl

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index b93a2fc24c3f9db5e64d047ab74b0e447725dbe5..2a4dcd76a405d337d9de0a582a708a9b5be9dfc5 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -7,7 +7,11 @@
         <option name="wxUSE_REGEX"/>
     </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>
     </if>
     <set var="LIB_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
@@ -24,6 +28,7 @@
         <define>$(UNICODE_DEFINE)</define>
         <dirname>$(LIBDIRNAME)</dirname>
         <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