don't lose fonts underlined flag in ReInit() (bug fix for the change in rev. 1.76)

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

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 049d830b0b7b9d49262e842e8948ce5cda2e16b1..b93a2fc24c3f9db5e64d047ab74b0e447725dbe5 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -10,21 +10,20 @@
         <set var="wxUSE_REGEX">builtin</set>
     </if>
     <set var="LIB_REGEX">
         <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>
 
     </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'">
          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>
         <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-8008 -w-8012 -w-8057 -w-8065 -w-8066 -w-8068 -w-8070
-        </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
         <sources>
             src/regex/regcomp.c
             src/regex/regexec.c