Don't use wx[H|V]SCROLL styles

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

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 41b7301dd27790cdf94be36d410a8de3290ab750..29fea0824441d1e2805186471e98844b2b2dfedb 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -8,15 +8,19 @@
         <set var="wxUSE_REGEX">builtin</set>
     </if>
     <set var="LIB_REGEX">
-        <if cond="wxUSE_REGEX=='builtin'">wxregex</if>
+        <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
     </set>
     <set var="INC_REGEX">
-        <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
+        <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
     </set>
 
     <lib id="wxregex" template="3rdparty_lib"
          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
+        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
+        <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+        <define>$(UNICODE_DEFINE)</define>
         <dirname>$(LIBDIRNAME)</dirname>
+        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8066</cflags-borland> 
         <sources>
             src/regex/regcomp.c
             src/regex/regexec.c