X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c29c1fead0048abe370c715dbed58f7caa43e6d..29dfc56bf45e8ca73182fd1fee9d43c5dfedf6c1:/build/bakefiles/regex.bkl

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 29fea08244..b93a2fc24c 100644
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -1,4 +1,6 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
     <if cond="FORMAT=='autoconf'">
@@ -8,19 +10,20 @@
         <set var="wxUSE_REGEX">builtin</set>
     </if>
     <set var="LIB_REGEX">
-        <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXUNICODEFLAG)$(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>$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
         <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> 
+        <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
         <sources>
             src/regex/regcomp.c
             src/regex/regexec.c